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

Commit 703e0489 authored by Diego Perez's avatar Diego Perez Committed by Android (Google) Code Review
Browse files

Merge "Removing layout from frameworks/base"

parents b205f4fb 4493b7c4

tools/layoutlib/.gitignore

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
bin

/.idea/workspace.xml

/out

/bridge/out

/.idea/kotlinc.xml
 
 No newline at end of file

tools/layoutlib/.idea/.name

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
layoutlib
 
 No newline at end of file

tools/layoutlib/.idea/artifacts/studio_android_widgets_jar.xml

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
<component name="ArtifactManager">

  <artifact type="jar" name="studio-android-widgets:jar">

    <output-path>$PROJECT_DIR$/out/artifacts/studio_android_widgets_jar</output-path>

    <root id="archive" name="studio-android-widgets.jar">

      <element id="module-output" name="studio-android-widgets" />

    </root>

  </artifact>

</component>
 
 No newline at end of file

tools/layoutlib/.idea/artifacts/studio_android_widgets_src_jar.xml

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
<component name="ArtifactManager">

  <artifact type="jar" name="studio-android-widgets-src:jar">

    <output-path>$PROJECT_DIR$/out/artifacts/studio_android_widgets_src_jar</output-path>

    <root id="archive" name="studio-android-widgets-src.jar">

      <element id="dir-copy" path="$PROJECT_DIR$/studio-custom-widgets/src" />

    </root>

  </artifact>

</component>
 
 No newline at end of file

tools/layoutlib/.idea/codeStyleSettings.xml

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="ProjectCodeStyleSettingsManager">

    <option name="PER_PROJECT_SETTINGS">

      <value>

        <option name="FIELD_NAME_PREFIX" value="m" />

        <option name="STATIC_FIELD_NAME_PREFIX" value="s" />

        <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" />

        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">

          <value />

        </option>

        <option name="IMPORT_LAYOUT_TABLE">

          <value>

            <package name="com.android" withSubpackages="true" static="false" />

            <emptyLine />

            <package name="org" withSubpackages="true" static="false" />

            <emptyLine />

            <package name="android" withSubpackages="true" static="false" />

            <emptyLine />

            <package name="java" 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" />

        <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />

        <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />

        <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />

        <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>

        <codeStyleSettings language="JAVA">

          <option name="KEEP_LINE_BREAKS" value="false" />

          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />

          <option name="CALL_PARAMETERS_WRAP" value="1" />

          <option name="METHOD_PARAMETERS_WRAP" value="1" />

          <option name="THROWS_LIST_WRAP" value="1" />

          <option name="EXTENDS_KEYWORD_WRAP" value="1" />

          <option name="THROWS_KEYWORD_WRAP" value="1" />

          <option name="BINARY_OPERATION_WRAP" value="1" />

          <option name="TERNARY_OPERATION_WRAP" value="1" />

          <option name="ARRAY_INITIALIZER_WRAP" value="1" />

          <option name="ASSIGNMENT_WRAP" value="1" />

          <option name="ASSERT_STATEMENT_WRAP" value="1" />

          <option name="IF_BRACE_FORCE" value="3" />

          <option name="DOWHILE_BRACE_FORCE" value="3" />

          <option name="WHILE_BRACE_FORCE" value="3" />

          <option name="FOR_BRACE_FORCE" value="3" />

          <option name="WRAP_LONG_LINES" value="true" />

          <arrangement>

            <groups>

              <group>

                <type>GETTERS_AND_SETTERS</type>

                <order>KEEP</order>

              </group>

              <group>

                <type>OVERRIDDEN_METHODS</type>

                <order>KEEP</order>

              </group>

            </groups>

          </arrangement>

        </codeStyleSettings>

        <codeStyleSettings language="XML">

          <indentOptions>

            <option name="CONTINUATION_INDENT_SIZE" value="4" />

          </indentOptions>

        </codeStyleSettings>

      </value>

    </option>

    <option name="USE_PER_PROJECT_SETTINGS" value="true" />

  </component>

</project>
 
 No newline at end of file