diff options
| author | Youngsang Cho <youngsang@google.com> | 2016-05-09 18:52:12 -0700 |
|---|---|---|
| committer | Youngsang Cho <youngsang@google.com> | 2016-05-17 15:14:50 -0700 |
| commit | 48dadb49248271b01997862e1335912a4f2e189f (patch) | |
| tree | fb402e0e2bda1328fd9858b28a98e1c29563f038 /LiveChannelsAndroidStyle.xml | |
| parent | 3a72b93e554bd22a5c64e71a6956d9604ce05108 (diff) | |
| download | TV-48dadb49248271b01997862e1335912a4f2e189f.tar.gz | |
DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4
Bug: 28469968
Change-Id: I74e368f5f58b433755932b806a90178e37bea7f9
Diffstat (limited to 'LiveChannelsAndroidStyle.xml')
| -rw-r--r-- | LiveChannelsAndroidStyle.xml | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/LiveChannelsAndroidStyle.xml b/LiveChannelsAndroidStyle.xml index 2f5bd30c..a2627ce2 100644 --- a/LiveChannelsAndroidStyle.xml +++ b/LiveChannelsAndroidStyle.xml @@ -34,6 +34,8 @@ <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" /> @@ -51,8 +53,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" /> @@ -88,7 +88,40 @@ <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"> @@ -244,4 +277,4 @@ <option name="FOR_BRACE_FORCE" value="3" /> <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> -</code_scheme> +</code_scheme>
\ No newline at end of file |