LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update code formatter to better reflect doc

Browse Source 
The documentation at https://s.android.com/source/code-style.html
diverged with the actual implementation of the AndroidStyle.xml

* android imports are now on top
* spaces inside empty tags i.g."foo />"
* keep android:id, layout_width and layout_height as top xml atts.

Change-Id: Id51533bf4285e74bd8393529580fd0e168150cb8
This commit is contained in:
Ben Weiss
2015-09-22 13:39:24 +01:00
parent 493e7aed48
commit 6385bd10c9
1 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ide/intellij/codestyles/AndroidStyle.xml
View File

@@ -18,6 +18,8 @@
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" /> <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
<option name="IMPORT_LAYOUT_TABLE"> <option name="IMPORT_LAYOUT_TABLE">
<value> <value>
<package name="android" withSubpackages="true" static="false" />
<emptyLine />
<package name="com.google" withSubpackages="true" static="false" /> <package name="com.google" withSubpackages="true" static="false" />
<emptyLine /> <emptyLine />
<package name="com" withSubpackages="true" static="false" /> <package name="com" withSubpackages="true" static="false" />
@@ -28,8 +30,6 @@
<emptyLine /> <emptyLine />
<package name="org" withSubpackages="true" static="false" /> <package name="org" withSubpackages="true" static="false" />
<emptyLine /> <emptyLine />
<package name="android" withSubpackages="true" static="false" />
<emptyLine />
<package name="java" withSubpackages="true" static="false" /> <package name="java" withSubpackages="true" static="false" />
<emptyLine /> <emptyLine />
<package name="javax" withSubpackages="true" static="false" /> <package name="javax" withSubpackages="true" static="false" />
@@ -82,6 +82,9 @@
<option name="LABEL_INDENT_ABSOLUTE" value="false" /> <option name="LABEL_INDENT_ABSOLUTE" value="false" />
<option name="USE_RELATIVE_INDENTS" value="false" /> <option name="USE_RELATIVE_INDENTS" value="false" />
</ADDITIONAL_INDENT_OPTIONS> </ADDITIONAL_INDENT_OPTIONS>
<XML>
<option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
</XML>
<ADDITIONAL_INDENT_OPTIONS fileType="java"> <ADDITIONAL_INDENT_OPTIONS fileType="java">
<option name="INDENT_SIZE" value="4" /> <option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" /> <option name="CONTINUATION_INDENT_SIZE" value="8" />
@@ -171,4 +174,38 @@
<option name="FOR_BRACE_FORCE" value="3" /> <option name="FOR_BRACE_FORCE" value="3" />
<option name="PARENT_SETTINGS_INSTALLED" value="true" /> <option name="PARENT_SETTINGS_INSTALLED" value="true" />
</codeStyleSettings> </codeStyleSettings>
<codeStyleSettings language="XML">
<arrangement>
<rules>
<section>
<rule>
<match>
<NAME>xmlns:.*</NAME>
</match>
</rule>
</section>
<section>
<rule>
<match>
<NAME>android:id</NAME>
</match>
</rule>
</section>
<section>
<rule>
<match>
<NAME>android:layout_width</NAME>
</match>
</rule>
</section>
<section>
<rule>
<match>
<NAME>android:layout_height</NAME>
</match>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme> </code_scheme>