Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev

Browse Source 
* commit 'a695f87db757e89ee99d3c672037b479dce3e4e7':
  Fix project settings.
This commit is contained in:
Deepanshu Gupta
2015-03-12 00:56:47 +00:00
committed by Android Git Automerger
parent ef1741d27b a695f87db7
commit ca9264eab0
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml generated
View File

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

28
tools/layoutlib/.idea/misc.xml generated
View File

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