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

Commit 6f5fac81 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

parents 44fea603 6092c044

tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
    </CLASSES>

    </CLASSES>

    <JAVADOC />

    <JAVADOC />

    <SOURCES>

    <SOURCES>

      <root url="file://$ANDROID_SRC$/tools/base/layoutlib-api/src/main/java" />

      <root url="jar://$PROJECT_DIR$/../../../../prebuilts/misc/common/layoutlib_api/layoutlib_api-sources.jar!/" />

    </SOURCES>

    </SOURCES>

  </library>

  </library>

</component>
 
</component>
 
 No newline at end of file

tools/layoutlib/.idea/misc.xml

+27 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,33 @@ 
  <component name="FrameworkDetectionExcludesConfiguration">

  <component name="FrameworkDetectionExcludesConfiguration">

    <type id="android" />

    <type id="android" />

  </component>

  </component>

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">

  <component name="NullableNotNullManager">

    <option name="myDefaultNullable" value="com.android.annotations.Nullable" />

    <option name="myDefaultNotNull" value="com.android.annotations.NonNull" />

    <option name="myNullables">

      <value>

        <list size="5">

          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />

          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />

          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />

          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />

          <item index="4" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />

        </list>

      </value>

    </option>

    <option name="myNotNulls">

      <value>

        <list size="5">

          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />

          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />

          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />

          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />

          <item index="4" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />

        </list>

      </value>

    </option>

  </component>

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/out" />

    <output url="file://$PROJECT_DIR$/out" />

  </component>

  </component>

</project>
 
</project>
 
 No newline at end of file