diff options
| author | 2015-03-12 00:31:52 +0000 | |
|---|---|---|
| committer | 2015-03-12 00:31:54 +0000 | |
| commit | 71518174fcd57c85d1e38f1794c44b763baff286 (patch) | |
| tree | ff50195ad9be671abe12ea7e2e06dac45686d0a2 | |
| parent | b171be1a54a6a0fe416916ff91e41362b8bb4873 (diff) | |
| parent | 7b2cae5072321da5d67f9d12dea10871326f3477 (diff) | |
Merge "Fix project settings." into lmp-mr1-dev
| -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 595200245b43..a8736000a513 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 fa48f70ac6a1..94bcd36b4b37 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 |