aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2018-04-27 14:32:59 -0700
committerAurimas Liutikas <aurimas@google.com>2018-04-27 14:32:59 -0700
commit2d7251e4a09c2ace8d69adf039e62cfa84344540 (patch)
tree0dbf7b164a0387da19e5bc737cced24edb765eff /.gitignore
parentee4c8bcb5f717224de63271c16d675c3d36cb308 (diff)
downloadsupport-2d7251e4a09c2ace8d69adf039e62cfa84344540.tar.gz
Move .idea style file to the new world.
It seems that Studio rebased to new IJ and IJ changed their code style format. I manually tried to copy as much as I could over, but a bunch of things just keep getting erased by Studio, so I'm guessing the names of some of the options have changed. Test: open studio and see code style settings (it now has proper import order) Change-Id: If2caf33adb436ed458cdca9821b4e991a2041959
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ac3565ce833..0b611c5613a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@
**/.idea/**
!**/.idea/codeStyleSettings.xml
!**/.idea/copyright
+!**/.idea/codeStyles
+!.idea/codeStyles/Project.xml
+!.idea/codeStyles/codeStyleConfig.xml
!.idea/copyright/AndroidCopyright.xml
!.idea/copyright/profiles_settings.xml
!.idea/vcs.xml