Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79ded2d0 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am f12d0233: am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1"... 

am f12d0233: am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge: 4e474160

* commit 'f12d0233':
  Changes made by intelliJ 14.1
parents 7131a7d6 f12d0233

tools/layoutlib/.idea/codeStyleSettings.xml

+3 −1
Original line number Diff line number Diff line
@@ -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>

tools/layoutlib/.idea/misc.xml

+1 −2
Original line number Diff line number Diff line
@@ -13,4 +13,3 @@ 
    <output url="file://$PROJECT_DIR$/out" />

  </component>

</project>
 
 No newline at end of file