diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-02-13 22:38:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-13 22:38:07 +0000 |
| commit | 4e47416012b8cb88d564a04a29c0b79a28b9e529 (patch) | |
| tree | d56d4296bdfce4743e88715d4692efc601561885 /tools | |
| parent | fe2c687b97f21b7dd5471279c1b2b9458dcd22bf (diff) | |
| parent | 12c9e4980e889d1c72656a4062f9cee9a0e6f15a (diff) | |
| download | frameworks_base-4e47416012b8cb88d564a04a29c0b79a28b9e529.zip frameworks_base-4e47416012b8cb88d564a04a29c0b79a28b9e529.tar.gz frameworks_base-4e47416012b8cb88d564a04a29c0b79a28b9e529.tar.bz2 | |
am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
* commit '12c9e4980e889d1c72656a4062f9cee9a0e6f15a':
Changes made by intelliJ 14.1
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/.idea/codeStyleSettings.xml | 4 | ||||
| -rw-r--r-- | tools/layoutlib/.idea/misc.xml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/layoutlib/.idea/codeStyleSettings.xml b/tools/layoutlib/.idea/codeStyleSettings.xml index a04e440..1f08f09 100644 --- a/tools/layoutlib/.idea/codeStyleSettings.xml +++ b/tools/layoutlib/.idea/codeStyleSettings.xml @@ -5,7 +5,6 @@ <value> <option name="FIELD_NAME_PREFIX" value="m" /> <option name="STATIC_FIELD_NAME_PREFIX" value="s" /> - <option name="USE_FQ_CLASS_NAMES_IN_JAVADOC" value="false" /> <option name="INSERT_INNER_CLASS_IMPORTS" value="true" /> <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" /> <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" /> @@ -34,6 +33,9 @@ <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" /> <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" /> <option name="WRAP_COMMENTS" value="true" /> + <JavaCodeStyleSettings> + <option name="CLASS_NAMES_IN_JAVADOC" value="3" /> + </JavaCodeStyleSettings> <XML> <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> </XML> diff --git a/tools/layoutlib/.idea/misc.xml b/tools/layoutlib/.idea/misc.xml index fd63e6c..fa48f70 100644 --- a/tools/layoutlib/.idea/misc.xml +++ b/tools/layoutlib/.idea/misc.xml @@ -12,5 +12,4 @@ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> -</project> - +</project>
\ No newline at end of file |