diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-07-08 11:26:24 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-07-08 11:26:24 -0700 |
| commit | c1ace1f7e1e49c81bb4b75377c99f07be340abfe (patch) | |
| tree | 9d0db96bd3d86ddfec80e7e3554cad9dcc066553 /.idea | |
| parent | c6218e46d5d2017e987ecdbd99b318a95c42abc0 (diff) | |
| download | idea-c1ace1f7e1e49c81bb4b75377c99f07be340abfe.tar.gz | |
Snapshot aea001abfc1b38fec3a821bcd5174cc77dc75787 from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: Icdea2a2bd7ad43b4d05967b1f0479db3bda1c93c
Diffstat (limited to '.idea')
24 files changed, 18 insertions, 560 deletions
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 3bb1d821e856..0b13401d8804 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -251,6 +251,10 @@ <option name="FOR_BRACE_FORCE" value="1" /> <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> + <codeStyleSettings language="Python"> + <option name="KEEP_LINE_BREAKS" value="false" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> + </codeStyleSettings> <codeStyleSettings language="SQL"> <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> diff --git a/.idea/copyright/aosp.xml b/.idea/copyright/aosp.xml deleted file mode 100644 index 077aec61bbea..000000000000 --- a/.idea/copyright/aosp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<component name="CopyrightManager"> - <copyright> - <option name="notice" value="Copyright (C) &#36;today.year The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License." /> - <option name="keyword" value="Copyright" /> - <option name="allowReplaceKeyword" value="" /> - <option name="myName" value="aosp" /> - <option name="myLocal" value="true" /> - </copyright> -</component>
\ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml index c0df0b2fc9b7..b84d8ef19a71 100644 --- a/.idea/copyright/profiles_settings.xml +++ b/.idea/copyright/profiles_settings.xml @@ -1,8 +1,6 @@ <component name="CopyrightManager"> <settings default="apache 2 license"> - <module2copyright> - <element module="aosp-code" copyright="aosp" /> - </module2copyright> + <module2copyright /> <LanguageOptions name="__TEMPLATE__"> <option name="addBlankAfter" value="false" /> </LanguageOptions> diff --git a/.idea/dictionaries/adt.xml b/.idea/dictionaries/adt.xml deleted file mode 100644 index e25bf25bdd10..000000000000 --- a/.idea/dictionaries/adt.xml +++ /dev/null @@ -1,321 +0,0 @@ -<component name="ProjectDictionaryState"> - <dictionary name="adt"> - <words> - <w>&amp</w> - <w>aapt</w> - <w>aarrggbb</w> - <w>accessors</w> - <w>actionbar</w> - <w>adb's</w> - <w>adbhost</w> - <w>addon</w> - <w>addons</w> - <w>addr</w> - <w>aidl</w> - <w>aload</w> - <w>androiddebugkey</w> - <w>anim</w> - <w>aosp</w> - <w>apkbuilder</w> - <w>apos</w> - <w>appname</w> - <w>areturn</w> - <w>argb</w> - <w>argv</w> - <w>armeabi</w> - <w>ast's</w> - <w>async</w> - <w>attrs</w> - <w>autofocus</w> - <w>automator</w> - <w>avd's</w> - <w>avdname</w> - <w>backfill</w> - <w>basename</w> - <w>basenames</w> - <w>bicubic</w> - <w>bilinear</w> - <w>bindir</w> - <w>bipush</w> - <w>bitcodelib</w> - <w>bitmask</w> - <w>blockquote</w> - <w>bluetooth</w> - <w>booleans</w> - <w>bootloader</w> - <w>borderless</w> - <w>bytecode</w> - <w>calloc</w> - <w>charsets</w> - <w>checkable</w> - <w>chksum</w> - <w>classfile</w> - <w>classname</w> - <w>classpathentry</w> - <w>clinit</w> - <w>clipart</w> - <w>closeables</w> - <w>codenames</w> - <w>combineaccessrules</w> - <w>compat</w> - <w>configurables</w> - <w>conv</w> - <w>crlf</w> - <w>crypto</w> - <w>cygpath</w> - <w>cygwin</w> - <w>dalvik</w> - <w>ddmlib</w> - <w>ddms</w> - <w>debuggable</w> - <w>densityless</w> - <w>designtime</w> - <w>dest</w> - <w>dexdump</w> - <w>digester</w> - <w>dimen</w> - <w>dirname</w> - <w>disp</w> - <w>donottranslate</w> - <w>dpad</w> - <w>drawables</w> - <w>dropdown</w> - <w>dumpsys</w> - <w>eabi</w> - <w>easymock</w> - <w>emdash</w> - <w>endian</w> - <w>enqueued</w> - <w>errno</w> - <w>executables</w> - <w>expectedly</w> - <w>filenames</w> - <w>filepath</w> - <w>fixme</w> - <w>fqcn</w> - <w>framebuffer</w> - <w>frameworkdir</w> - <w>froyo</w> - <w>fwvga</w> - <w>gbdserver</w> - <w>gdbserver</w> - <w>genkey</w> - <w>getenv</w> - <w>getfield</w> - <w>getprop</w> - <w>getstatic</w> - <w>globbing</w> - <w>goto</w> - <w>gradle</w> - <w>guide's</w> - <w>guillemets</w> - <w>hardcode</w> - <w>hardcoding</w> - <w>hashcode</w> - <w>hdpi</w> - <w>holo</w> - <w>horiz</w> - <w>httpclient</w> - <w>hvga</w> - <w>iaload</w> - <w>iastore</w> - <w>iconst</w> - <w>inflater</w> - <w>infos</w> - <w>inlined</w> - <w>innerclass</w> - <w>inputfile</w> - <w>insn</w> - <w>instantiatable</w> - <w>instrumentations</w> - <w>intelli</w> - <w>interpolator</w> - <w>ints</w> - <w>invokestatic</w> - <w>invokevirtual</w> - <w>ipsum</w> - <w>ireturn</w> - <w>iterable</w> - <w>jarfile</w> - <w>jarlist</w> - <w>jarpath</w> - <w>javabuilder</w> - <w>javanature</w> - <w>jdwp</w> - <w>jpeg</w> - <w>junit</w> - <w>keepclasseswithmembernames</w> - <w>keepclasseswithmembers</w> - <w>keygen</w> - <w>keypass</w> - <w>keysexposed</w> - <w>keyshidden</w> - <w>keyssoft</w> - <w>keystore</w> - <w>keytool</w> - <w>kxml</w> - <w>landroid</w> - <w>layoublib</w> - <w>layoutlib</w> - <w>layoutlibs</w> - <w>layoutopt</w> - <w>layoutrules</w> - <w>ldltr</w> - <w>ldpi</w> - <w>ldrtl</w> - <w>levenshtein</w> - <w>lexing</w> - <w>libc</w> - <w>licensable</w> - <w>licensor</w> - <w>linenumber</w> - <w>ljava</w> - <w>lombok</w> - <w>lookups</w> - <w>lookupswitch</w> - <w>looper</w> - <w>lorem</w> - <w>lpackage</w> - <w>makefile</w> - <w>malloc</w> - <w>manifestmerger</w> - <w>manifmerger</w> - <w>mdpi</w> - <w>memalign</w> - <w>minsdk</w> - <w>mipmap</w> - <w>mkdirs</w> - <w>monospace</w> - <w>moreunit</w> - <w>multimap</w> - <w>multipart</w> - <w>multitouch</w> - <w>nano</w> - <w>nativelib</w> - <w>navexposed</w> - <w>navhidden</w> - <w>ninepatch</w> - <w>nodpi</w> - <w>nokeys</w> - <w>nonav</w> - <w>notlong</w> - <w>notnight</w> - <w>notouch</w> - <w>nullable</w> - <w>nulling</w> - <w>nullness</w> - <w>objectweb</w> - <w>opcode</w> - <w>opcodes</w> - <w>pathname</w> - <w>picasa</w> - <w>plugin's</w> - <w>png's</w> - <w>prebuilts</w> - <w>prefs</w> - <w>preload</w> - <w>prepending</w> - <w>printf</w> - <w>println</w> - <w>proc</w> - <w>prog</w> - <w>progdir</w> - <w>programmatically</w> - <w>proguard</w> - <w>prolog</w> - <w>qemu</w> - <w>quickfix</w> - <w>quickstart</w> - <w>qvga</w> - <w>rasterize</w> - <w>rasterizer</w> - <w>realloc</w> - <w>recurse</w> - <w>reflow</w> - <w>reformats</w> - <w>reimplement</w> - <w>renderscript</w> - <w>reparse</w> - <w>resampling</w> - <w>resizability</w> - <w>resized</w> - <w>rrggbb</w> - <w>sccs</w> - <w>screenshot</w> - <w>scroller</w> - <w>scrollview</w> - <w>sdcard</w> - <w>sdk's</w> - <w>sdkbin</w> - <w>sdklib</w> - <w>sdkman</w> - <w>sdks</w> - <w>serialnumber</w> - <w>severities</w> - <w>sparsearray</w> - <w>sqrt</w> - <w>stacktrace</w> - <w>stderr</w> - <w>stdout</w> - <w>stopship</w> - <w>storepass</w> - <w>storetype</w> - <w>styleable</w> - <w>subclassed</w> - <w>subclassing</w> - <w>subfolder</w> - <w>submenu</w> - <w>superset</w> - <w>sysdir</w> - <w>sysimg</w> - <w>targetsdk</w> - <w>testcase</w> - <w>testroot</w> - <w>testsuite</w> - <w>tmpdir</w> - <w>traceview</w> - <w>tuple</w> - <w>tvdpi</w> - <w>uiautomator</w> - <w>uname</w> - <w>unarchive</w> - <w>unary</w> - <w>uncapitalized</w> - <w>uncompressing</w> - <w>unescape</w> - <w>unescaping</w> - <w>unformatted</w> - <w>unlocalized</w> - <w>unmanages</w> - <w>unregister</w> - <w>unregisters</w> - <w>userdata</w> - <w>versioncode</w> - <w>vert</w> - <w>viewport</w> - <w>vmsig</w> - <w>wakelock</w> - <w>wakelocks</w> - <w>wakeup</w> - <w>webkit</w> - <w>wikipedia</w> - <w>workdir</w> - <w>wqvga</w> - <w>writeable</w> - <w>wvga</w> - <w>xdpi</w> - <w>xerces</w> - <w>xfermode</w> - <w>xhdpi</w> - <w>xhigh</w> - <w>xlarge</w> - <w>xliff</w> - <w>xmlns</w> - <w>xxhdpi</w> - <w>xxhigh</w> - <w>ydpi</w> - <w>yyyy</w> - <w>zipalign</w> - </words> - </dictionary> -</component>
\ No newline at end of file diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml index f622821077c6..b357b21dfba0 100644 --- a/.idea/inspectionProfiles/idea_default.xml +++ b/.idea/inspectionProfiles/idea_default.xml @@ -50,7 +50,7 @@ <inspection_tool class="ConstantConditionalExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="ConstantConditions" enabled="true" level="WARNING" enabled_by_default="true"> <scope name="runtime.classes" level="WARNING" enabled="false"> - <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="true" /> + <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" /> <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" /> </scope> <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="true" /> @@ -317,10 +317,6 @@ <inspection_tool class="MethodNamesDifferOnlyByCase" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="MethodOverloadsParentMethod" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="MethodOverridesStaticMethod" enabled="true" level="WARNING" enabled_by_default="true" /> - <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="ERROR" enabled_by_default="true"> - <option name="ignoreObjectMethods" value="true" /> - <option name="ignoreAnonymousClassMethods" value="false" /> - </inspection_tool> <inspection_tool class="MisspelledCompareTo" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="MisspelledEquals" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="MisspelledHashcode" enabled="true" level="WARNING" enabled_by_default="true" /> @@ -371,8 +367,11 @@ <inspection_tool class="PyChainedComparisonsInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PyComparisonWithNoneInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PyCompatibilityInspection" enabled="false" level="ERROR" enabled_by_default="false"> - <option name="fromVersion" value="2.4" /> - <option name="toVersion" value="3.1" /> + <option name="ourVersions"> + <value> + <list size="0" /> + </value> + </option> </inspection_tool> <inspection_tool class="PyDecoratorInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PyDefaultArgumentInspection" enabled="false" level="WARNING" enabled_by_default="false" /> diff --git a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml index 20deb1dfa5da..1048466dfe80 100644 --- a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml +++ b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml @@ -722,7 +722,6 @@ <inspection_tool class="StrutsTilesInspection" enabled="false" level="ERROR" enabled_by_default="false" /> <inspection_tool class="StrutsValidatorFormInspection" enabled="false" level="ERROR" enabled_by_default="false" /> <inspection_tool class="StrutsValidatorInspection" enabled="false" level="ERROR" enabled_by_default="false" /> - <inspection_tool class="SuperClassHasFrequentlyUsedInheritors" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="SynchronizeOnThis" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="SystemOutErr" enabled="true" level="WARNING" enabled_by_default="true"> @@ -813,6 +812,7 @@ <inspection_tool class="VtlTypesInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="W3CssValidation" enabled="false" level="WARNING" enabled_by_default="false"> <option name="myCssVersion" value="css3" /> + <option name="myIgnoreVendorSpecificProperties" value="false" /> </inspection_tool> <inspection_tool class="WSReferenceInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="WaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" /> diff --git a/.idea/libraries/asm_tools.xml b/.idea/libraries/asm_tools.xml deleted file mode 100644 index 6009e9f32e01..000000000000 --- a/.idea/libraries/asm_tools.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="asm-tools"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/asm-tools/asm-4.0.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/asm-tools/asm-analysis-4.0.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/asm-tools/asm-tree-4.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/asm-tools/src-4.0.zip!/" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/bouncy_castle.xml b/.idea/libraries/bouncy_castle.xml deleted file mode 100644 index 70ec93b828ec..000000000000 --- a/.idea/libraries/bouncy_castle.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="bouncy-castle"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar!/" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/commons_compress.xml b/.idea/libraries/commons_compress.xml deleted file mode 100644 index be33df8d0a7d..000000000000 --- a/.idea/libraries/commons_compress.xml +++ /dev/null @@ -1,9 +0,0 @@ -<component name="libraryTable"> - <library name="commons-compress"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/commons-compress/commons-compress-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/easymock_tools.xml b/.idea/libraries/easymock_tools.xml deleted file mode 100644 index d01b8848a450..000000000000 --- a/.idea/libraries/easymock_tools.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="easymock-tools"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/easymock-tools/easymock-3.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/easymock-tools/easymock-3.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/easymock-tools/easymock-3.1-sources.jar!/" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/freemarker_2_3_19.xml b/.idea/libraries/freemarker_2_3_19.xml deleted file mode 100644 index 8015e9e92722..000000000000 --- a/.idea/libraries/freemarker_2_3_19.xml +++ /dev/null @@ -1,11 +0,0 @@ -<component name="libraryTable"> - <library name="freemarker-2.3.19"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/freemarker/freemarker-2.3.19.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/freemarker/src.zip!/" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/guava_tools.xml b/.idea/libraries/guava_tools.xml deleted file mode 100644 index 4e67511461a3..000000000000 --- a/.idea/libraries/guava_tools.xml +++ /dev/null @@ -1,11 +0,0 @@ -<component name="libraryTable"> - <library name="guava-tools"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/guava-tools/guava-13.0.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/guava-tools/src.zip!/" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/http_client.xml b/.idea/libraries/http_client.xml deleted file mode 100644 index 9f81f117a41f..000000000000 --- a/.idea/libraries/http_client.xml +++ /dev/null @@ -1,26 +0,0 @@ -<component name="libraryTable"> - <library name="http-client"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/commons-codec-1.4.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/commons-logging-1.1.1.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/httpclient-4.1.1.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/httpcore-4.1.jar!/" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/httpmime-4.1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/commons-codec-1.4-src.zip!/commons-codec-1.4-src/src/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/commons-logging-1.1.1-src.zip!/commons-logging-1.1.1-src/src/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip!/httpcomponents-client-4.1.1/httpclient/src/main/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip!/httpcomponents-client-4.1.1/httpclient-cache/src/main/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip!/httpcomponents-client-4.1.1/httpmime/src/main/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip!/httpcomponents-client-4.1.1/httpclient-benchmark/src/main/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-client-4.1.1-src.zip!/httpcomponents-client-4.1.1/httpclient-contrib/src/main/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-core-4.1-src.zip!/httpcomponents-core-4.1/httpcore-contrib/src/main/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-core-4.1-src.zip!/httpcomponents-core-4.1/httpcore-nio/src/main/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-core-4.1-src.zip!/httpcomponents-core-4.1/httpcore-benchmark/src/main/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-core-4.1-src.zip!/httpcomponents-core-4.1/httpcore/src/main/java" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/http-client/src/httpcomponents-core-4.1-src.zip!/httpcomponents-core-4.1/httpcore-ab/src/main/java" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/junit3_tools.xml b/.idea/libraries/junit3_tools.xml deleted file mode 100644 index b3dd3f3b78cd..000000000000 --- a/.idea/libraries/junit3_tools.xml +++ /dev/null @@ -1,9 +0,0 @@ -<component name="libraryTable"> - <library name="junit3-tools"> - <CLASSES> - <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/kxml2.xml b/.idea/libraries/kxml2.xml deleted file mode 100644 index 688c2383b2be..000000000000 --- a/.idea/libraries/kxml2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="kxml2"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/kxml2-tools/kxml2-2.3.0.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/kxml2-tools/kxml2-src-2.3.0.zip!/www/kxml2/javadoc" /> - </JAVADOC> - <SOURCES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/kxml2-tools/kxml2-src-2.3.0.zip!/src" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/lombok_ast.xml b/.idea/libraries/lombok_ast.xml deleted file mode 100644 index 250dbb9d8f9b..000000000000 --- a/.idea/libraries/lombok_ast.xml +++ /dev/null @@ -1,16 +0,0 @@ -<component name="libraryTable"> - <library name="lombok-ast"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/lombok-ast/lombok-ast-0.2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/lombok-ast/lombok-ast-0.2.1-src.zip!/src/template" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/lombok-ast/lombok-ast-0.2.1-src.zip!/src/ecjTransformer" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/lombok-ast/lombok-ast-0.2.1-src.zip!/src/javacTransformer" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/lombok-ast/lombok-ast-0.2.1-src.zip!/src/printer" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/lombok-ast/lombok-ast-0.2.1-src.zip!/src/main" /> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/lombok-ast/lombok-ast-0.2.1-src.zip!/build/lombok.ast_generatedSource" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 60db4aed945b..804f4a7fff4f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,10 @@ <entry_points version="2.0" /> </component> <component name="FrameworkDetectionExcludesConfiguration"> - <type id="android" /> + <file type="android" url="file://$PROJECT_DIR$/plugins/android/testData/AndroidManifest.xml" /> + <file type="android" url="file://$PROJECT_DIR$/plugins/android/testData/lint/global/buttonsOrder/AndroidManifest.xml" /> + <file type="android" url="file://$PROJECT_DIR$/plugins/android/testData/lint/global/manifestOrder/AndroidManifest.xml" /> + <file type="android" url="file://$PROJECT_DIR$/plugins/android/testData/resNavigation/AndroidManifest.xml" /> </component> <component name="IdProvider" IDEtalkID="88DB5D232B345F18EEFB2825E88EC093" /> <component name="JavadocGenerationManager"> @@ -24,30 +27,6 @@ <option name="LOCALE" /> <option name="OPEN_IN_BROWSER" value="true" /> </component> - <component name="NullableNotNullManager"> - <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" /> - <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" /> - <option name="myNullables"> - <value> - <list size="4"> - <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="com.android.annotations.Nullable" /> - </list> - </value> - </option> - <option name="myNotNulls"> - <value> - <list size="4"> - <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="com.android.annotations.NonNull" /> - </list> - </value> - </option> - </component> <component name="ProjectDetails"> <option name="projectName" value="idea-community" /> </component> diff --git a/.idea/modules.xml b/.idea/modules.xml index fdae697811c6..c9b64c74cd29 100755..100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -11,28 +11,19 @@ <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-xml.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-xml.iml" group="plugins/IntelliLang" /> <module fileurl="file://$PROJECT_DIR$/plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml" filepath="$PROJECT_DIR$/plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/RegExpSupport/RegExpSupport.iml" filepath="$PROJECT_DIR$/RegExpSupport/RegExpSupport.iml" group="platform" /> - <module fileurl="file://$PROJECT_DIR$/../adt/idea/adt-branding/adt-branding.iml" filepath="$PROJECT_DIR$/../adt/idea/adt-branding/adt-branding.iml" group="plugins/Android" /> <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" filepath="$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" group="platform" /> - <module fileurl="file://$PROJECT_DIR$/../adt/idea/android/android.iml" filepath="$PROJECT_DIR$/../adt/idea/android/android.iml" group="plugins/Android" /> - <module fileurl="file://$PROJECT_DIR$/../adt/idea/android/common/android-common.iml" filepath="$PROJECT_DIR$/../adt/idea/android/common/android-common.iml" group="plugins/Android" /> - <module fileurl="file://$PROJECT_DIR$/../adt/idea/android-designer/android-designer.iml" filepath="$PROJECT_DIR$/../adt/idea/android-designer/android-designer.iml" group="plugins/Android" /> - <module fileurl="file://$PROJECT_DIR$/../adt/idea/android-gradle-jps/android-gradle-jps.iml" filepath="$PROJECT_DIR$/../adt/idea/android-gradle-jps/android-gradle-jps.iml" group="plugins/Android" /> - <module fileurl="file://$PROJECT_DIR$/../adt/idea/android/jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/../adt/idea/android/jps-plugin/android-jps-plugin.iml" group="plugins/Android" /> - <module fileurl="file://$PROJECT_DIR$/../adt/idea/android/rt/android-rt.iml" filepath="$PROJECT_DIR$/../adt/idea/android/rt/android-rt.iml" group="plugins/Android" /> <module fileurl="file://$PROJECT_DIR$/platform/annotations/annotations.iml" filepath="$PROJECT_DIR$/platform/annotations/annotations.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/plugins/ant/ant.iml" filepath="$PROJECT_DIR$/plugins/ant/ant.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/jps/antLayout/antlayout.iml" filepath="$PROJECT_DIR$/jps/antLayout/antlayout.iml" group="jps" /> <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" group="plugins/GAE" /> - <module fileurl="file://$PROJECT_DIR$/../base/asset-studio/assetstudio.iml" filepath="$PROJECT_DIR$/../base/asset-studio/assetstudio.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/bindSvn/bindSvn.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/bindSvn/bindSvn.iml" group="plugins/VCS" /> <module fileurl="file://$PROJECT_DIR$/platform/boot/boot.iml" filepath="$PROJECT_DIR$/platform/boot/boot.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" /> <module fileurl="file://$PROJECT_DIR$/colorSchemes/colorSchemes.iml" filepath="$PROJECT_DIR$/colorSchemes/colorSchemes.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/plugins/commander/commander.iml" filepath="$PROJECT_DIR$/plugins/commander/commander.iml" group="plugins" /> - <module fileurl="file://$PROJECT_DIR$/../base/common/common.iml" filepath="$PROJECT_DIR$/../base/common/common.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/plugins/eclipse/common-eclipse-util/common-eclipse-util.iml" filepath="$PROJECT_DIR$/plugins/eclipse/common-eclipse-util/common-eclipse-util.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/javaFX/common-javaFX-plugin/common-javaFX-plugin.iml" filepath="$PROJECT_DIR$/plugins/javaFX/common-javaFX-plugin/common-javaFX-plugin.iml" group="plugins/JavaFX" /> <module fileurl="file://$PROJECT_DIR$/community-main.iml" filepath="$PROJECT_DIR$/community-main.iml" /> @@ -47,7 +38,6 @@ <module fileurl="file://$PROJECT_DIR$/build/cucumber-test-runner/cucumber-test-runner.iml" filepath="$PROJECT_DIR$/build/cucumber-test-runner/cucumber-test-runner.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/cvs/cvs-core/cvs-core.iml" filepath="$PROJECT_DIR$/plugins/cvs/cvs-core/cvs-core.iml" group="plugins/VCS/cvs" /> <module fileurl="file://$PROJECT_DIR$/plugins/cvs/cvs-plugin/cvs-plugin.iml" filepath="$PROJECT_DIR$/plugins/cvs/cvs-plugin/cvs-plugin.iml" group="plugins/VCS/cvs" /> - <module fileurl="file://$PROJECT_DIR$/../base/ddmlib/ddmlib.iml" filepath="$PROJECT_DIR$/../base/ddmlib/ddmlib.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/java/debugger/impl/debugger-impl.iml" filepath="$PROJECT_DIR$/java/debugger/impl/debugger-impl.iml" group="java" /> <module fileurl="file://$PROJECT_DIR$/java/debugger/openapi/debugger-openapi.iml" filepath="$PROJECT_DIR$/java/debugger/openapi/debugger-openapi.iml" group="java" /> <module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit.iml" group="plugins" /> @@ -55,9 +45,7 @@ <module fileurl="file://$PROJECT_DIR$/xml/dom-impl/dom-impl.iml" filepath="$PROJECT_DIR$/xml/dom-impl/dom-impl.iml" group="xml" /> <module fileurl="file://$PROJECT_DIR$/xml/dom-openapi/dom-openapi.iml" filepath="$PROJECT_DIR$/xml/dom-openapi/dom-openapi.iml" group="xml" /> <module fileurl="file://$PROJECT_DIR$/xml/dom-tests/dom-tests.iml" filepath="$PROJECT_DIR$/xml/dom-tests/dom-tests.iml" group="xml" /> - <module fileurl="file://$PROJECT_DIR$/../base/draw9patch/draw9patch.iml" filepath="$PROJECT_DIR$/../base/draw9patch/draw9patch.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/platform/dvcs/dvcs.iml" filepath="$PROJECT_DIR$/platform/dvcs/dvcs.iml" group="platform" /> - <module fileurl="file://$PROJECT_DIR$/../base/device_validator/dvlib/dvlib.iml" filepath="$PROJECT_DIR$/../base/device_validator/dvlib/dvlib.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/plugins/eclipse/eclipse.iml" filepath="$PROJECT_DIR$/plugins/eclipse/eclipse.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/eclipse/jps-plugin/eclipse-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/eclipse/jps-plugin/eclipse-jps-plugin.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/java/execution/impl/execution-impl.iml" filepath="$PROJECT_DIR$/java/execution/impl/execution-impl.iml" group="java" /> @@ -114,13 +102,8 @@ <module fileurl="file://$PROJECT_DIR$/plugins/junit_rt/junit_rt.iml" filepath="$PROJECT_DIR$/plugins/junit_rt/junit_rt.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/platform/lang-api/lang-api.iml" filepath="$PROJECT_DIR$/platform/lang-api/lang-api.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" filepath="$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" group="platform" /> - <module fileurl="file://$PROJECT_DIR$/../base/layoutlib-api/layoutlib-api.iml" filepath="$PROJECT_DIR$/../base/layoutlib-api/layoutlib-api.iml" group="plugins/Android/android-sdk" /> - <module fileurl="file://$PROJECT_DIR$/../base/lint/libs/lint-api/lint-api.iml" filepath="$PROJECT_DIR$/../base/lint/libs/lint-api/lint-api.iml" group="plugins/Android/android-sdk/lint" /> - <module fileurl="file://$PROJECT_DIR$/../base/lint/libs/lint-checks/lint-checks.iml" filepath="$PROJECT_DIR$/../base/lint/libs/lint-checks/lint-checks.iml" group="plugins/Android/android-sdk/lint" /> - <module fileurl="file://$PROJECT_DIR$/../base/lint/cli/lint-cli.iml" filepath="$PROJECT_DIR$/../base/lint/cli/lint-cli.iml" group="plugins/Android/android-sdk/lint" /> <module fileurl="file://$PROJECT_DIR$/platform/lvcs-api/lvcs-api.iml" filepath="$PROJECT_DIR$/platform/lvcs-api/lvcs-api.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/lvcs-impl/lvcs-impl.iml" filepath="$PROJECT_DIR$/platform/lvcs-impl/lvcs-impl.iml" group="platform" /> - <module fileurl="file://$PROJECT_DIR$/../base/manifest-merger/manifest-merger.iml" filepath="$PROJECT_DIR$/../base/manifest-merger/manifest-merger.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven.iml" filepath="$PROJECT_DIR$/plugins/maven/maven.iml" group="plugins/maven" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" group="plugins/maven" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" group="plugins/maven" /> @@ -128,7 +111,6 @@ <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven-server-api/maven-server-api.iml" filepath="$PROJECT_DIR$/plugins/maven/maven-server-api/maven-server-api.iml" group="plugins/maven" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven2-server-impl/maven2-server-impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven2-server-impl/maven2-server-impl.iml" group="plugins/maven" /> <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven3-server-impl/maven3-server-impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven3-server-impl/maven3-server-impl.iml" group="plugins/maven" /> - <module fileurl="file://$PROJECT_DIR$/../base/ninepatch/ninepatch.iml" filepath="$PROJECT_DIR$/../base/ninepatch/ninepatch.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/java/openapi/openapi.iml" filepath="$PROJECT_DIR$/java/openapi/openapi.iml" group="java" /> <module fileurl="file://$PROJECT_DIR$/platform/platform-api/platform-api.iml" filepath="$PROJECT_DIR$/platform/platform-api/platform-api.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/platform-impl/platform-impl.iml" filepath="$PROJECT_DIR$/platform/platform-impl/platform-impl.iml" group="platform" /> @@ -139,11 +121,11 @@ <module fileurl="file://$PROJECT_DIR$/platform/projectModel-api/projectModel-api.iml" filepath="$PROJECT_DIR$/platform/projectModel-api/projectModel-api.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/platform/projectModel-impl/projectModel-impl.iml" filepath="$PROJECT_DIR$/platform/projectModel-impl/projectModel-impl.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/plugins/properties/properties.iml" filepath="$PROJECT_DIR$/plugins/properties/properties.iml" group="plugins" /> + <module fileurl="file://$PROJECT_DIR$/platform/remote-servers/api/remote-servers-api.iml" filepath="$PROJECT_DIR$/platform/remote-servers/api/remote-servers-api.iml" group="platform" /> + <module fileurl="file://$PROJECT_DIR$/platform/remote-servers/impl/remote-servers-impl.iml" filepath="$PROJECT_DIR$/platform/remote-servers/impl/remote-servers-impl.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/xml/relaxng/relaxng.iml" filepath="$PROJECT_DIR$/xml/relaxng/relaxng.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/resources/resources.iml" filepath="$PROJECT_DIR$/resources/resources.iml" /> <module fileurl="file://$PROJECT_DIR$/resources-en/resources-en.iml" filepath="$PROJECT_DIR$/resources-en/resources-en.iml" /> - <module fileurl="file://$PROJECT_DIR$/../base/sdk-common/sdk-common.iml" filepath="$PROJECT_DIR$/../base/sdk-common/sdk-common.iml" group="plugins/Android/android-sdk" /> - <module fileurl="file://$PROJECT_DIR$/../base/sdklib/sdklib.iml" filepath="$PROJECT_DIR$/../base/sdklib/sdklib.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/platform/smRunner/smRunner.iml" filepath="$PROJECT_DIR$/platform/smRunner/smRunner.iml" group="platform" /> <module fileurl="file://$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" filepath="$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" group="plugins/VCS/cvs" /> <module fileurl="file://$PROJECT_DIR$/spellchecker/spellchecker.iml" filepath="$PROJECT_DIR$/spellchecker/spellchecker.iml" group="plugins" /> @@ -161,7 +143,6 @@ <module fileurl="file://$PROJECT_DIR$/plugins/testng/testng.iml" filepath="$PROJECT_DIR$/plugins/testng/testng.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/testng_rt/testng_rt.iml" filepath="$PROJECT_DIR$/plugins/testng_rt/testng_rt.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/platform/testFramework/bootstrap/tests_bootstrap.iml" filepath="$PROJECT_DIR$/platform/testFramework/bootstrap/tests_bootstrap.iml" group="platform" /> - <module fileurl="file://$PROJECT_DIR$/../base/testutils/testutils.iml" filepath="$PROJECT_DIR$/../base/testutils/testutils.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer/ui-designer.iml" filepath="$PROJECT_DIR$/plugins/ui-designer/ui-designer.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer-core/ui-designer-core.iml" filepath="$PROJECT_DIR$/plugins/ui-designer-core/ui-designer-core.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/ui-designer/jps-plugin/ui-designer-jps-plugin.iml" group="plugins" /> diff --git a/.idea/runConfigurations/AndroidStudio.xml b/.idea/runConfigurations/AndroidStudio.xml deleted file mode 100644 index 6f1a448e170c..000000000000 --- a/.idea/runConfigurations/AndroidStudio.xml +++ /dev/null @@ -1,25 +0,0 @@ -<component name="ProjectRunConfigurationManager"> - <configuration default="false" name="AndroidStudio" type="Application" factoryName="Application"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" /> - <option name="VM_PARAMETERS" value="-ea -Xbootclasspath/p:../out/classes/production/boot -Xms384m -Xmx768m -Didea.is.internal=true -XX:MaxPermSize=384m -Dapple.awt.graphics.UseQuartz=true -Didea.platform.prefix=AndroidStudio -Dsun.awt.disablegrab=true" /> - <option name="PROGRAM_PARAMETERS" value="" /> - <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bin" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" value="" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="community-main" /> - <envs /> - <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="" /> - <option name="TRANSPORT" value="0" /> - <option name="LOCAL" value="true" /> - </RunnerSettings> - <RunnerSettings RunnerId="Run" /> - <ConfigurationWrapper RunnerId="Debug" /> - <ConfigurationWrapper RunnerId="Run" /> - <method /> - </configuration> -</component>
\ No newline at end of file diff --git a/.idea/scopes/androidplugin.xml b/.idea/scopes/androidplugin.xml deleted file mode 100644 index dcc1341cfd15..000000000000 --- a/.idea/scopes/androidplugin.xml +++ /dev/null @@ -1,3 +0,0 @@ -<component name="DependencyValidationManager"> - <scope name="androidplugin" pattern="file[group:Android]:*//*&&!file[group:android-sdk]:*//*" /> -</component>
\ No newline at end of file diff --git a/.idea/scopes/aosp_code.xml b/.idea/scopes/aosp_code.xml deleted file mode 100644 index abf77af5586b..000000000000 --- a/.idea/scopes/aosp_code.xml +++ /dev/null @@ -1,3 +0,0 @@ -<component name="DependencyValidationManager"> - <scope name="aosp-code" pattern="test[group:android-sdk]:*..*||src[group:android-sdk]:*..*" /> -</component>
\ No newline at end of file diff --git a/.idea/scopes/obsoleteplugin.xml b/.idea/scopes/obsoleteplugin.xml deleted file mode 100644 index 0537436e7d19..000000000000 --- a/.idea/scopes/obsoleteplugin.xml +++ /dev/null @@ -1,3 +0,0 @@ -<component name="DependencyValidationManager"> - <scope name="obsoleteplugin" pattern="file[community-main]:plugins/android//*||file[community-main]:plugins/android-designer//*" /> -</component>
\ No newline at end of file diff --git a/.idea/scopes/platform.xml b/.idea/scopes/platform.xml deleted file mode 100644 index a0bafd1f53f9..000000000000 --- a/.idea/scopes/platform.xml +++ /dev/null @@ -1,3 +0,0 @@ -<component name="DependencyValidationManager"> - <scope name="platform" pattern="src:*..*&&!src[group:Android]:*..*" /> -</component>
\ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index d1499b10f867..275077f82558 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,8 +2,6 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="" vcs="Git" /> - <mapping directory="$PROJECT_DIR$/../adt/idea" vcs="Git" /> - <mapping directory="$PROJECT_DIR$/../base" vcs="Git" /> </component> </project> |