diff --git a/.gitignore b/.gitignore
index ad69aadb26e97..9a78642e8ce47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@
 .classpath
 .project
 .settings/
-.vscode/
+.vscode/*
 
 # Flutter repo-specific
 /bin/cache/
@@ -130,3 +130,4 @@ app.*.symbols
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
+!.vscode/settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000..6613273525af2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,11 @@
+// VSCode workspace settings that are shared among all users of this project.
+// This only affects subdirectories of this project.
+{
+    // VSCode formats files on save by default. Since Flutter source code is
+    // hand-formatted, the default settings are changed to prevent inadvertent
+    // reformatting of code.
+    "editor.formatOnSave": false,
+    "editor.formatOnType": false,
+
+    "html.format.enable": false
+}
\ No newline at end of file