diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-03-12 00:56:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-12 00:56:47 +0000 |
| commit | ca9264eab03cf787fb4dfc62a2313d9c3b45a05e (patch) | |
| tree | 2934a2df99871eb316c82fe50229eb2fff946119 /tools | |
| parent | ef1741d27b19fe63a7d8541b8745e166eb135252 (diff) | |
| parent | a695f87db757e89ee99d3c672037b479dce3e4e7 (diff) | |
| download | frameworks_base-ca9264eab03cf787fb4dfc62a2313d9c3b45a05e.zip frameworks_base-ca9264eab03cf787fb4dfc62a2313d9c3b45a05e.tar.gz frameworks_base-ca9264eab03cf787fb4dfc62a2313d9c3b45a05e.tar.bz2 | |
am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev
* commit 'a695f87db757e89ee99d3c672037b479dce3e4e7':
Fix project settings.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml | 2 | ||||
| -rw-r--r-- | tools/layoutlib/.idea/misc.xml | 28 |
2 files changed, 28 insertions, 2 deletions
diff --git a/tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml b/tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml index 5952002..a873600 100644 --- a/tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml +++ b/tools/layoutlib/.idea/libraries/layoutlib_api_prebuilt.xml @@ -5,7 +5,7 @@ </CLASSES> <JAVADOC /> <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> </library> </component>
\ No newline at end of file diff --git a/tools/layoutlib/.idea/misc.xml b/tools/layoutlib/.idea/misc.xml index fa48f70..94bcd36 100644 --- a/tools/layoutlib/.idea/misc.xml +++ b/tools/layoutlib/.idea/misc.xml @@ -9,7 +9,33 @@ <component name="FrameworkDetectionExcludesConfiguration"> <type id="android" /> </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" /> </component> </project>
\ No newline at end of file |