Fix import order config file for Intellij.
Start following out public style guide for imports:
https://source.android.com/source/code-style.html#order-import-statements
Bug: 25852971
Change-Id: I3db2b964cfc772657d71bcf5229d3ac27b6b3f2f
diff --git a/ide/intellij/codestyles/AndroidStyle.xml b/ide/intellij/codestyles/AndroidStyle.xml
index 67a4090..f8ba353 100644
--- a/ide/intellij/codestyles/AndroidStyle.xml
+++ b/ide/intellij/codestyles/AndroidStyle.xml
@@ -18,12 +18,42 @@
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
<option name="IMPORT_LAYOUT_TABLE">
<value>
+ <package name="android" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="com.android" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="dalvik" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="libcore" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="com" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="gov" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="junit" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="net" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="org" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="java" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="javax" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="true" />
+ <emptyLine />
<package name="android" withSubpackages="true" static="false" />
<emptyLine />
- <package name="com.google" withSubpackages="true" static="false" />
+ <package name="com.android" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="dalvik" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="libcore" withSubpackages="true" static="false" />
<emptyLine />
<package name="com" withSubpackages="true" static="false" />
<emptyLine />
+ <package name="gov" withSubpackages="true" static="false" />
+ <emptyLine />
<package name="junit" withSubpackages="true" static="false" />
<emptyLine />
<package name="net" withSubpackages="true" static="false" />
@@ -35,8 +65,6 @@
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
- <emptyLine />
- <package name="" withSubpackages="true" static="true" />
</value>
</option>
<option name="RIGHT_MARGIN" value="100" />