diff options
| author | 2015-02-17 22:24:09 +0000 | |
|---|---|---|
| committer | 2015-02-17 22:24:09 +0000 | |
| commit | f12d02339fefc4111b62715d5c0fb2e58570c34b (patch) | |
| tree | 6d9faf0df02d31a0ce1c2319a0e1e96209a71cc4 | |
| parent | d245ad24f5e6e8c7b302689467b12718c94f4ced (diff) | |
| parent | 221d732005b04b5f979d2e03e8ebe00160e52ca3 (diff) | |
am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e47416
* commit '221d732005b04b5f979d2e03e8ebe00160e52ca3':
Changes made by intelliJ 14.1
| -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 a04e4405e6b2..1f08f0978b46 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 fd63e6c66f2d..fa48f70ac6a1 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 |