IDEA-95242 IDEA-93047 support android sdk tools r21

plugins/android-designer/src/com/intellij/android/designer/profile/ThemeManager.java

@@ -15,12 +15,11 @@
  */
 package com.intellij.android.designer.profile;
 
-import com.android.ide.common.resources.ResourceResolver;
+import com.android.SdkConstants;
 import com.android.ide.common.resources.configuration.ScreenSizeQualifier;
 import com.android.resources.ResourceType;
 import com.android.resources.ScreenSize;
 import com.android.sdklib.IAndroidTarget;
-import com.android.sdklib.SdkConstants;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.containers.hash.HashSet;
@@ -297,12 +296,12 @@ public class ThemeManager {
 
   @NotNull
   private static ThemeData getThemeByRef(@NotNull String themeRef) {
-    boolean isProjectTheme = !themeRef.startsWith(ResourceResolver.PREFIX_ANDROID_STYLE);
-    if (themeRef.startsWith(ResourceResolver.PREFIX_STYLE)) {
-      themeRef = themeRef.substring(ResourceResolver.PREFIX_STYLE.length());
+    boolean isProjectTheme = !themeRef.startsWith(SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX);
+    if (themeRef.startsWith(SdkConstants.STYLE_RESOURCE_PREFIX)) {
+      themeRef = themeRef.substring(SdkConstants.STYLE_RESOURCE_PREFIX.length());
     }
-    else if (themeRef.startsWith(ResourceResolver.PREFIX_ANDROID_STYLE)) {
-      themeRef = themeRef.substring(ResourceResolver.PREFIX_ANDROID_STYLE.length());
+    else if (themeRef.startsWith(SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX)) {
+      themeRef = themeRef.substring(SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX.length());
     }
     return new ThemeData(themeRef, isProjectTheme);
   }
@@ -318,7 +317,7 @@ public class ThemeManager {
                                   : targetApiLevel;
 
     return targetApiLevel >= 11 && renderingTargetApiLevel >= 11 && screenSize == ScreenSize.XLARGE
-           ? ResourceResolver.PREFIX_ANDROID_STYLE + "Theme.Holo"
-           : ResourceResolver.PREFIX_ANDROID_STYLE + "Theme";
+           ? SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX + "Theme.Holo"
+           : SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX + "Theme";
   }
 }
\ No newline at end of file

plugins/android/android.iml

@@ -31,7 +31,7 @@
           <root url="jar://$MODULE_DIR$/lib/androidprefs.jar!/" />
           <root url="jar://$MODULE_DIR$/lib/jarutils.jar!/" />
           <root url="jar://$MODULE_DIR$/lib/common.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/ide_common.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/sdk_common.jar!/" />
           <root url="jar://$MODULE_DIR$/lib/ninepatch.jar!/" />
           <root url="jar://$MODULE_DIR$/lib/layoutlib_api.jar!/" />
           <root url="jar://$MODULE_DIR$/lib/kxml2-2.3.0.jar!/" />
@@ -39,11 +39,15 @@
           <root url="jar://$MODULE_DIR$/lib/lint_checks.jar!/" />
           <root url="jar://$MODULE_DIR$/lib/lint.jar!/" />
           <root url="jar://$MODULE_DIR$/lib/lombok-ast-0.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/asm-4.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/asm-analysis-4.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/asm-tree-4.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/dvlib.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
           <root url="jar://$MODULE_DIR$/lib/src/ddmlib_src.zip!/src" />
-          <root url="jar://$MODULE_DIR$/lib/src/ide_common_src.zip!/src" />
+          <root url="jar://$MODULE_DIR$/lib/src/sdk_common_src.zip!/src" />
           <root url="jar://$MODULE_DIR$/lib/src/common_src.zip!/src" />
           <root url="jar://$MODULE_DIR$/lib/src/jarutils.zip!/src" />
           <root url="jar://$MODULE_DIR$/lib/src/layoutlib_api_src.zip!/src" />
@@ -53,6 +57,7 @@
           <root url="jar://$MODULE_DIR$/lib/src/lint_api_src.zip!/src" />
           <root url="jar://$MODULE_DIR$/lib/src/lint_checks_src.zip!/src" />
           <root url="jar://$MODULE_DIR$/lib/src/lint_src.zip!/src" />
+          <root url="jar://$MODULE_DIR$/lib/src/dvlib_src.zip!/src" />
         </SOURCES>
       </library>
     </orderEntry>