diff options
| author | Youngsang Cho <youngsang@google.com> | 2016-05-11 01:20:46 +0000 |
|---|---|---|
| committer | Youngsang Cho <youngsang@google.com> | 2016-05-11 01:20:46 +0000 |
| commit | 3a72b93e554bd22a5c64e71a6956d9604ce05108 (patch) | |
| tree | 3d9a5451eb5ac85f8c18619c282eb82eb8fa2ddf /LiveChannelsAndroidStyle.xml | |
| parent | 369b6a409204a9b2a95f7ba575d7c3b7bdc94ab7 (diff) | |
| download | TV-3a72b93e554bd22a5c64e71a6956d9604ce05108.tar.gz | |
DO NOT MERGE Revert "DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4"
This reverts commit 369b6a409204a9b2a95f7ba575d7c3b7bdc94ab7.
Change-Id: I9abfc39974fa42edcc1eb6b6ec2e53782b4fcf5f
Diffstat (limited to 'LiveChannelsAndroidStyle.xml')
| -rw-r--r-- | LiveChannelsAndroidStyle.xml | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/LiveChannelsAndroidStyle.xml b/LiveChannelsAndroidStyle.xml index a2627ce2..2f5bd30c 100644 --- a/LiveChannelsAndroidStyle.xml +++ b/LiveChannelsAndroidStyle.xml @@ -34,8 +34,6 @@ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" /> <option name="IMPORT_LAYOUT_TABLE"> <value> - <package name="" withSubpackages="true" static="true" /> - <emptyLine /> <package name="android" withSubpackages="true" static="false" /> <emptyLine /> <package name="com.google" withSubpackages="true" static="false" /> @@ -53,6 +51,8 @@ <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" /> @@ -88,40 +88,7 @@ <option name="DOWHILE_BRACE_FORCE" value="3" /> <option name="WHILE_BRACE_FORCE" value="3" /> <option name="FOR_BRACE_FORCE" value="3" /> - <AndroidXmlCodeStyleSettings> - <option name="USE_CUSTOM_SETTINGS" value="true" /> - </AndroidXmlCodeStyleSettings> - <Objective-C-extensions> - <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" /> - <option name="RELEASE_STYLE" value="IVAR" /> - <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" /> - <file> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> - </file> - <class> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> - </class> - <extensions> - <pair source="cpp" header="h" /> - <pair source="c" header="h" /> - </extensions> - </Objective-C-extensions> <XML> - <option name="XML_KEEP_BLANK_LINES" value="1" /> - <option name="XML_ALIGN_ATTRIBUTES" value="false" /> <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> </XML> <codeStyleSettings language="CFML"> @@ -277,4 +244,4 @@ <option name="FOR_BRACE_FORCE" value="3" /> <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> -</code_scheme>
\ No newline at end of file +</code_scheme> |