Constants refactoring.

This changeset moves most constants into the SdkConstants
class, and gets rid of AndroidConstants and LintConstants.
It also migrates all non-ADT specific constants from
AdtConstants into SdkConstants. It furthermore moves various
other constants (such as those in XmlUtils and ValuesDescriptors)
into the constants class. It also fixes the modifier order
to be the canonical modifier order (JLS 8.x).

Finally, it removes redundancy and combines various constant
aliases such that we don't have both NAME_ATTR and ATTR_NAME
pointing to "name", etc.

Change-Id: Ifd1755016f62ce2dd80e5c76130d6de4b0e32161

4 files changed, 17 insertions, 29 deletions

diff --git a/ide_common/src/com/android/ide/common/resources/FrameworkResources.java b/ide_common/src/com/android/ide/common/resources/FrameworkResources.java
index 2115cdc..fbf5926 100755
--- a/ide_common/src/com/android/ide/common/resources/FrameworkResources.java
+++ b/ide_common/src/com/android/ide/common/resources/FrameworkResources.java
@@ -16,8 +16,8 @@
 
 package com.android.ide.common.resources;
 
-import static com.android.AndroidConstants.FD_RES_VALUES;
 
+import com.android.SdkConstants;
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
 import com.android.io.IAbstractFile;
@@ -103,7 +103,7 @@ public class FrameworkResources extends ResourceRepository {
      * @param logger a logger to report issues to
      */
     public void loadPublicResources(@NonNull IAbstractFolder resFolder, @Nullable ILogger logger) {
-        IAbstractFolder valueFolder = resFolder.getFolder(FD_RES_VALUES);
+        IAbstractFolder valueFolder = resFolder.getFolder(SdkConstants.FD_RES_VALUES);
         if (valueFolder.exists() == false) {
             return;
         }
diff --git a/ide_common/src/com/android/ide/common/resources/ResourceRepository.java b/ide_common/src/com/android/ide/common/resources/ResourceRepository.java
index 6fb8457..ac0614d 100755
--- a/ide_common/src/com/android/ide/common/resources/ResourceRepository.java
+++ b/ide_common/src/com/android/ide/common/resources/ResourceRepository.java
@@ -16,7 +16,7 @@
 
 package com.android.ide.common.resources;
 
-import com.android.AndroidConstants;
+import com.android.SdkConstants;
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
 import com.android.ide.common.rendering.api.ResourceValue;
@@ -309,7 +309,7 @@ public abstract class ResourceRepository {
     @Nullable
     public ResourceFolder processFolder(@NonNull IAbstractFolder folder) {
         // split the name of the folder in segments.
-        String[] folderSegments = folder.getName().split(AndroidConstants.RES_QUALIFIER_SEP);
+        String[] folderSegments = folder.getName().split(SdkConstants.RES_QUALIFIER_SEP);
 
         // get the enum for the resource type.
         ResourceFolderType type = ResourceFolderType.getTypeByName(folderSegments[0]);
diff --git a/ide_common/src/com/android/ide/common/resources/ResourceResolver.java b/ide_common/src/com/android/ide/common/resources/ResourceResolver.java
index 772d75e..d742c4a 100644
--- a/ide_common/src/com/android/ide/common/resources/ResourceResolver.java
+++ b/ide_common/src/com/android/ide/common/resources/ResourceResolver.java
@@ -16,6 +16,13 @@
 
 package com.android.ide.common.resources;
 
+import static com.android.SdkConstants.ANDROID_PREFIX;
+import static com.android.SdkConstants.ANDROID_THEME_PREFIX;
+import static com.android.SdkConstants.PREFIX_ANDROID;
+import static com.android.SdkConstants.PREFIX_RESOURCE_REF;
+import static com.android.SdkConstants.PREFIX_THEME_REF;
+import static com.android.SdkConstants.REFERENCE_STYLE;
+
 import com.android.ide.common.rendering.api.LayoutLog;
 import com.android.ide.common.rendering.api.RenderResources;
 import com.android.ide.common.rendering.api.ResourceValue;
@@ -28,24 +35,6 @@ import java.util.Map;
 
 public class ResourceResolver extends RenderResources {
 
-    /** The constant {@code style/} */
-    public final static String REFERENCE_STYLE = ResourceType.STYLE.getName() + "/";
-    /** The constant {@code @android:} */
-    public final static String PREFIX_ANDROID_RESOURCE_REF = "@android:";
-    /** The constant {@code @} */
-    public final static String PREFIX_RESOURCE_REF = "@";
-    /** The constant {@code ?android:} */
-    public final static String PREFIX_ANDROID_THEME_REF = "?android:";
-    /** The constant {@code ?} */
-    public final static String PREFIX_THEME_REF = "?";
-    /** The constant {@code android:} */
-    public final static String PREFIX_ANDROID = "android:";
-    /** The constant {@code @style/} */
-    public static final String PREFIX_STYLE = PREFIX_RESOURCE_REF + REFERENCE_STYLE;
-    /** The constant {@code @android:style/} */
-    public static final String PREFIX_ANDROID_STYLE = PREFIX_ANDROID_RESOURCE_REF
-            + REFERENCE_STYLE;
-
     private final Map<ResourceType, Map<String, ResourceValue>> mProjectResources;
     private final Map<ResourceType, Map<String, ResourceValue>> mFrameworkResources;
 
@@ -209,9 +198,9 @@ public class ResourceResolver extends RenderResources {
             boolean frameworkOnly = false;
 
             // eliminate the prefix from the string
-            if (reference.startsWith(PREFIX_ANDROID_THEME_REF)) {
+            if (reference.startsWith(ANDROID_THEME_PREFIX)) {
                 frameworkOnly = true;
-                reference = reference.substring(PREFIX_ANDROID_THEME_REF.length());
+                reference = reference.substring(ANDROID_THEME_PREFIX.length());
             } else {
                 reference = reference.substring(PREFIX_THEME_REF.length());
             }
@@ -265,10 +254,9 @@ public class ResourceResolver extends RenderResources {
             }
 
             // Eliminate the prefix from the string.
-            if (reference.startsWith(PREFIX_ANDROID_RESOURCE_REF)) {
+            if (reference.startsWith(ANDROID_PREFIX)) {
                 frameworkOnly = true;
-                reference = reference.substring(
-                        PREFIX_ANDROID_RESOURCE_REF.length());
+                reference = reference.substring(ANDROID_PREFIX.length());
             } else {
                 reference = reference.substring(PREFIX_RESOURCE_REF.length());
             }
diff --git a/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java b/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java
index f12ed8f..e2fe767 100644
--- a/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java
+++ b/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java
@@ -16,7 +16,7 @@
 
 package com.android.ide.common.resources.configuration;
 
-import com.android.AndroidConstants;
+import com.android.SdkConstants;
 import com.android.resources.Density;
 import com.android.resources.ResourceFolderType;
 import com.android.resources.ScreenOrientation;
@@ -566,7 +566,7 @@ public final class FolderConfiguration implements Comparable<FolderConfiguration
             if (qualifier != null) {
                 String segment = qualifier.getFolderSegment();
                 if (segment != null && segment.length() > 0) {
-                    result.append(AndroidConstants.RES_QUALIFIER_SEP);
+                    result.append(SdkConstants.RES_QUALIFIER_SEP);
                     result.append(segment);
                 }
             }