Move ResourceFolderType into common.

Moved some constants from sdklib (which is not a dependency
of common but instead depends on common) into common.

Change-Id: I6fdfbad4e77813a9f2a2ca9ea0d740692d8bce5b

diff --git a/common/src/com/android/AndroidConstants.java b/common/src/com/android/AndroidConstants.java
new file mode 100644 (file)
index 0000000..dfe137a
--- /dev/null
+++ b/common/src/com/android/AndroidConstants.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package com.android;
+
+/**
+ * Generic Android Constants.
+ */
+public class AndroidConstants {
+
+    /** Default anim resource folder name, i.e. "anim" */
+    public final static String FD_RES_ANIM = "anim"; //$NON-NLS-1$
+    /** Default animator resource folder name, i.e. "animator" */
+    public final static String FD_RES_ANIMATOR = "animator"; //$NON-NLS-1$
+    /** Default color resource folder name, i.e. "color" */
+    public final static String FD_RES_COLOR = "color"; //$NON-NLS-1$
+    /** Default drawable resource folder name, i.e. "drawable" */
+    public final static String FD_RES_DRAWABLE = "drawable"; //$NON-NLS-1$
+    /** Default interpolator resource folder name, i.e. "interpolator" */
+    public final static String FD_RES_INTERPOLATOR = "interpolator"; //$NON-NLS-1$
+    /** Default layout resource folder name, i.e. "layout" */
+    public final static String FD_RES_LAYOUT = "layout"; //$NON-NLS-1$
+    /** Default menu resource folder name, i.e. "menu" */
+    public final static String FD_RES_MENU = "menu"; //$NON-NLS-1$
+    /** Default menu resource folder name, i.e. "mipmap" */
+    public final static String FD_RES_MIPMAP = "mipmap"; //$NON-NLS-1$
+    /** Default values resource folder name, i.e. "values" */
+    public final static String FD_RES_VALUES = "values"; //$NON-NLS-1$
+    /** Default xml resource folder name, i.e. "xml" */
+    public final static String FD_RES_XML = "xml"; //$NON-NLS-1$
+    /** Default raw resource folder name, i.e. "raw" */
+    public final static String FD_RES_RAW = "raw"; //$NON-NLS-1$
+
+    /** Separator between the resource folder qualifier. */
+    public final static String RES_QUALIFIER_SEP = "-"; //$NON-NLS-1$
+
+}

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolderType.java b/common/src/com/android/resources/ResourceFolderType.java
similarity index 69%
rename from eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolderType.java
rename to common/src/com/android/resources/ResourceFolderType.java
index 91aec28..3a5b64d 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolderType.java
+++ b/common/src/com/android/resources/ResourceFolderType.java
@@ -1,11 +1,11 @@
 /*
  * Copyright (C) 2007 The Android Open Source Project
  *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
+ * 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.eclipse.org/org/documents/epl-v10.php
+ *      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,
@@ -14,26 +14,25 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.internal.resources.manager;
+package com.android.resources;
 
-import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
-import com.android.sdklib.SdkConstants;
+import com.android.AndroidConstants;
 
 /**
  * Enum representing a type of resource folder.
  */
 public enum ResourceFolderType {
-    ANIM(SdkConstants.FD_ANIM),
-    ANIMATOR(SdkConstants.FD_ANIMATOR),
-    COLOR(SdkConstants.FD_COLOR),
-    DRAWABLE(SdkConstants.FD_DRAWABLE),
-    INTERPOLATOR(SdkConstants.FD_INTERPOLATOR),
-    LAYOUT(SdkConstants.FD_LAYOUT),
-    MENU(SdkConstants.FD_MENU),
-    MIPMAP(SdkConstants.FD_MIPMAP),
-    RAW(SdkConstants.FD_RAW),
-    VALUES(SdkConstants.FD_VALUES),
-    XML(SdkConstants.FD_XML);
+    ANIM(AndroidConstants.FD_RES_ANIM),
+    ANIMATOR(AndroidConstants.FD_RES_ANIMATOR),
+    COLOR(AndroidConstants.FD_RES_COLOR),
+    DRAWABLE(AndroidConstants.FD_RES_DRAWABLE),
+    INTERPOLATOR(AndroidConstants.FD_RES_INTERPOLATOR),
+    LAYOUT(AndroidConstants.FD_RES_LAYOUT),
+    MENU(AndroidConstants.FD_RES_MENU),
+    MIPMAP(AndroidConstants.FD_RES_MIPMAP),
+    RAW(AndroidConstants.FD_RES_RAW),
+    VALUES(AndroidConstants.FD_RES_VALUES),
+    XML(AndroidConstants.FD_RES_XML);
 
     private final String mName;
 
@@ -71,7 +70,7 @@ public enum ResourceFolderType {
      */
     public static ResourceFolderType getFolderType(String folderName) {
         // split the name of the folder in segments.
-        String[] folderSegments = folderName.split(FolderConfiguration.QUALIFIER_SEP);
+        String[] folderSegments = folderName.split(AndroidConstants.RES_QUALIFIER_SEP);
 
         // get the enum for the resource type.
         return getTypeByName(folderSegments[0]);

diff --git a/common/src/com/android/resources/ResourceType.java b/common/src/com/android/resources/ResourceType.java
index a4d3aa2..e9d4d53 100644 (file)
--- a/common/src/com/android/resources/ResourceType.java
+++ b/common/src/com/android/resources/ResourceType.java
@@ -1,11 +1,11 @@
 /*
  * Copyright (C) 2007 The Android Open Source Project
  *
- * Licensed under the Eclipse Public License, Version 1.0 (the "License");
+ * 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.eclipse.org/org/documents/epl-v10.php
+ *      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,

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java
index 0b14358..e7c5157 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.eclipse.adt;
 
+import com.android.AndroidConstants;
 import com.android.ide.eclipse.adt.internal.build.builders.PostCompilerBuilder;
 import com.android.ide.eclipse.adt.internal.build.builders.PreCompilerBuilder;
 import com.android.ide.eclipse.adt.internal.build.builders.ResourceManagerBuilder;
@@ -144,7 +145,7 @@ public class AdtConstants {
     public final static String WS_ASSETS = WS_SEP + SdkConstants.FD_ASSETS;
 
     /** Absolute path of the layout folder, e.g. "/res/layout".<br> This is a workspace path. */
-    public final static String WS_LAYOUTS = WS_RESOURCES + WS_SEP + SdkConstants.FD_LAYOUT;
+    public final static String WS_LAYOUTS = WS_RESOURCES + WS_SEP + AndroidConstants.FD_RES_LAYOUT;
 
     /** Leaf of the javaDoc folder. Does not start with a separator. */
     public final static String WS_JAVADOC_FOLDER_LEAF = SdkConstants.FD_DOCS + "/" + //$NON-NLS-1$

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
index 28244b9..eb89db1 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
@@ -36,7 +36,6 @@ import com.android.ide.eclipse.adt.internal.resources.manager.GlobalProjectMonit
 import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFile;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolder;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 import com.android.ide.eclipse.adt.internal.resources.manager.GlobalProjectMonitor.IFileListener;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
@@ -44,6 +43,7 @@ import com.android.ide.eclipse.adt.internal.sdk.Sdk.ITargetChangeListener;
 import com.android.ide.eclipse.adt.internal.ui.EclipseUiHelper;
 import com.android.ide.eclipse.ddms.DdmsPlugin;
 import com.android.io.StreamException;
+import com.android.resources.ResourceFolderType;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
 import com.android.sdkstats.SdkStatsService;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java
index e1a4fa0..f13e201 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java
@@ -16,14 +16,15 @@
 
 package com.android.ide.eclipse.adt.internal.build;
 
-import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.AndroidConstants;
 import com.android.ide.eclipse.adt.AdtConstants;
+import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.internal.build.builders.BaseBuilder;
 import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs;
 import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs.BuildVerbosity;
 import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
+import com.android.resources.ResourceFolderType;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
 
@@ -140,7 +141,7 @@ public class RenderScriptProcessor extends SourceProcessor {
         IFolder genFolder = getGenFolder();
 
         IFolder rawFolder = project.getFolder(
-                new Path(SdkConstants.FD_RES).append(SdkConstants.FD_RAW));
+                new Path(SdkConstants.FD_RES).append(AndroidConstants.FD_RES_RAW));
 
         int depIndex;
 

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/MatchingStrategy.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/MatchingStrategy.java
index c6c5261..077400f 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/MatchingStrategy.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/MatchingStrategy.java
@@ -17,8 +17,8 @@
 package com.android.ide.eclipse.adt.internal.editors.layout;
 
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolder;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
+import com.android.resources.ResourceFolderType;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.ui.IEditorInput;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
index ea6cf9c..d82774d 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
@@ -33,7 +33,6 @@ import com.android.ide.eclipse.adt.internal.resources.configurations.VersionQual
 import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFile;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolder;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData;
 import com.android.ide.eclipse.adt.internal.sdk.LayoutDevice;
@@ -43,6 +42,7 @@ import com.android.ide.eclipse.adt.internal.sdk.LayoutDevice.DeviceConfig;
 import com.android.resources.Density;
 import com.android.resources.DockMode;
 import com.android.resources.NightMode;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 import com.android.resources.ScreenOrientation;
 import com.android.sdklib.AndroidVersion;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LayoutCreatorDialog.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LayoutCreatorDialog.java
index 978f114..ace26fb 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LayoutCreatorDialog.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/LayoutCreatorDialog.java
@@ -19,10 +19,10 @@ package com.android.ide.eclipse.adt.internal.editors.layout.configuration;
 import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.ResourceQualifier;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.ui.ConfigurationSelector;
 import com.android.ide.eclipse.adt.internal.ui.ConfigurationSelector.ConfigurationState;
 import com.android.ide.eclipse.adt.internal.ui.ConfigurationSelector.SelectorMode;
+import com.android.resources.ResourceFolderType;
 import com.android.sdkuilib.ui.GridDialog;
 
 import org.eclipse.jface.dialogs.Dialog;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
index a1a653f..88711e2 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java
@@ -34,8 +34,8 @@ import com.android.ide.common.rendering.api.SessionParams;
 import com.android.ide.common.rendering.api.SessionParams.RenderingMode;
 import com.android.ide.common.resources.ResourceResolver;
 import com.android.ide.common.sdk.LoadStatus;
-import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.AdtConstants;
+import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.internal.editors.IPageImageProvider;
 import com.android.ide.eclipse.adt.internal.editors.IconFactory;
 import com.android.ide.eclipse.adt.internal.editors.layout.ContextPullParser;
@@ -59,7 +59,6 @@ import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfi
 import com.android.ide.eclipse.adt.internal.resources.configurations.ScreenSizeQualifier;
 import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFile;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
@@ -69,6 +68,7 @@ import com.android.ide.eclipse.adt.io.IFolderWrapper;
 import com.android.io.IAbstractFile;
 import com.android.io.StreamException;
 import com.android.resources.Density;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeFinder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeFinder.java
index 080afce..c69c402 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeFinder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeFinder.java
@@ -19,7 +19,7 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2;
 import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML;
 import static com.android.ide.eclipse.adt.AdtConstants.WS_LAYOUTS;
 import static com.android.ide.eclipse.adt.AdtConstants.WS_SEP;
-import static com.android.sdklib.SdkConstants.FD_LAYOUT;
+import static com.android.AndroidConstants.FD_RES_LAYOUT;
 
 import static org.eclipse.core.resources.IResourceDelta.ADDED;
 import static org.eclipse.core.resources.IResourceDelta.CHANGED;
@@ -666,7 +666,7 @@ public class IncludeFinder {
         //     /res/layout/foo.xml => "foo"
         //     /res/layout-land/foo.xml => "-land/foo"
 
-        if (FD_LAYOUT.equals(folderName)) {
+        if (FD_RES_LAYOUT.equals(folderName)) {
             // Normal case -- keep just the basename
             return name;
         } else {
@@ -913,7 +913,7 @@ public class IncludeFinder {
         public IFile getFile() {
             String reference = mId;
             if (!reference.contains(WS_SEP)) {
-                reference = SdkConstants.FD_LAYOUT + WS_SEP + reference;
+                reference = FD_RES_LAYOUT + WS_SEP + reference;
             }
 
             String projectPath = SdkConstants.FD_RESOURCES + WS_SEP + reference + '.' + EXT_XML;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java
index 58ae8ff..77431c4 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java
@@ -15,8 +15,8 @@
  */
 package com.android.ide.eclipse.adt.internal.editors.layout.gle2;
 
+import static com.android.AndroidConstants.FD_RES_ANIMATOR;
 import static com.android.ide.eclipse.adt.AdtConstants.WS_SEP;
-import static com.android.sdklib.SdkConstants.FD_ANIMATOR;
 import static com.android.sdklib.SdkConstants.FD_RESOURCES;
 
 import com.android.ide.common.rendering.api.Capability;
@@ -228,7 +228,7 @@ public class PlayAnimationMenu extends SubmenuAction {
             LayoutEditor editor = mCanvas.getLayoutEditor();
             IWorkbenchWindow workbenchWindow = editor.getEditorSite().getWorkbenchWindow();
             IWorkbench workbench = workbenchWindow.getWorkbench();
-            String animationDir = FD_RESOURCES + WS_SEP + FD_ANIMATOR;
+            String animationDir = FD_RESOURCES + WS_SEP + FD_RES_ANIMATOR;
             Pair<IProject, String> pair = Pair.of(editor.getProject(), animationDir);
             IStructuredSelection selection = new StructuredSelection(pair);
             wizard.init(workbench, selection);

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/xml/Hyperlinks.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/xml/Hyperlinks.java
index 1456b47..efd95e2 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/xml/Hyperlinks.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/xml/Hyperlinks.java
@@ -46,7 +46,6 @@ import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfi
 import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFile;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolder;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
@@ -55,6 +54,7 @@ import com.android.ide.eclipse.adt.io.IFolderWrapper;
 import com.android.io.FileWrapper;
 import com.android.io.IAbstractFile;
 import com.android.io.IAbstractFolder;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidPackageRenameParticipant.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidPackageRenameParticipant.java
index 2fbb4a3..3a8348d 100755 (executable)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidPackageRenameParticipant.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidPackageRenameParticipant.java
@@ -16,6 +16,7 @@
 \r
 package com.android.ide.eclipse.adt.internal.refactoring.core;\r
 \r
+import com.android.AndroidConstants;\r
 import com.android.ide.common.layout.LayoutConstants;\r
 import com.android.ide.eclipse.adt.AdtConstants;\r
 import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper;\r
@@ -297,7 +298,7 @@ public class AndroidPackageRenameParticipant extends AndroidRenameParticipant {
                 IResource resource = layoutMembers[j];\r
                 if (resource instanceof IFolder\r
                         && resource.exists()\r
-                        && resource.getName().startsWith(SdkConstants.FD_LAYOUT)) {\r
+                        && resource.getName().startsWith(AndroidConstants.FD_RES_LAYOUT)) {\r
                     IFolder layoutFolder = (IFolder) resource;\r
                     IResource[] members = layoutFolder.members();\r
                     for (int i = 0; i < members.length; i++) {\r

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeMoveParticipant.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeMoveParticipant.java
index 48da579..735c595 100755 (executable)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeMoveParticipant.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeMoveParticipant.java
@@ -16,6 +16,7 @@
 \r
 package com.android.ide.eclipse.adt.internal.refactoring.core;\r
 \r
+import com.android.AndroidConstants;\r
 import com.android.ide.common.layout.LayoutConstants;\r
 import com.android.ide.eclipse.adt.AdtConstants;\r
 import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper;\r
@@ -232,7 +233,7 @@ public class AndroidTypeMoveParticipant extends MoveParticipant {
     private void addLayoutChanges(IProject project, String className) {\r
         try {\r
             IFolder resFolder = project.getFolder(SdkConstants.FD_RESOURCES);\r
-            IFolder layoutFolder = resFolder.getFolder(SdkConstants.FD_LAYOUT);\r
+            IFolder layoutFolder = resFolder.getFolder(AndroidConstants.FD_RES_LAYOUT);\r
             IResource[] members = layoutFolder.members();\r
             for (int i = 0; i < members.length; i++) {\r
                 IResource member = members[i];\r

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeRenameParticipant.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeRenameParticipant.java
index 53c941a..b80125a 100755 (executable)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeRenameParticipant.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeRenameParticipant.java
@@ -16,6 +16,7 @@
 \r
 package com.android.ide.eclipse.adt.internal.refactoring.core;\r
 \r
+import com.android.AndroidConstants;\r
 import com.android.ide.common.layout.LayoutConstants;\r
 import com.android.ide.eclipse.adt.AdtConstants;\r
 import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper;\r
@@ -193,7 +194,7 @@ public class AndroidTypeRenameParticipant extends AndroidRenameParticipant {
     private void addLayoutChanges(IProject project, String className) {\r
         try {\r
             IFolder resFolder = project.getFolder(SdkConstants.FD_RESOURCES);\r
-            IFolder layoutFolder = resFolder.getFolder(SdkConstants.FD_LAYOUT);\r
+            IFolder layoutFolder = resFolder.getFolder(AndroidConstants.FD_RES_LAYOUT);\r
             IResource[] members = layoutFolder.members();\r
             for (int i = 0; i < members.length; i++) {\r
                 IResource member = members[i];\r

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java
index 1c5c56c..413abcf 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java
@@ -17,11 +17,12 @@
 package com.android.ide.eclipse.adt.internal.refactorings.extractstring;
 
 
+import com.android.AndroidConstants;
 import com.android.ide.eclipse.adt.AdtConstants;
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.ui.ConfigurationSelector;
 import com.android.ide.eclipse.adt.internal.ui.ConfigurationSelector.SelectorMode;
+import com.android.resources.ResourceFolderType;
 import com.android.sdklib.SdkConstants;
 
 import org.eclipse.core.resources.IFolder;
@@ -576,7 +577,7 @@ class ExtractStringInputPage extends UserInputWizardPage implements IWizardPage
                     wsFolderPath = wsFolderPath.substring(0, pos);
                 }
 
-                String[] folderSegments = wsFolderPath.split(FolderConfiguration.QUALIFIER_SEP);
+                String[] folderSegments = wsFolderPath.split(AndroidConstants.RES_QUALIFIER_SEP);
 
                 if (folderSegments.length > 0) {
                     String folderName = folderSegments[0];

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringRefactoring.java
index 48a0544..955a0b2 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringRefactoring.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringRefactoring.java
@@ -26,7 +26,7 @@ import com.android.ide.eclipse.adt.internal.editors.resources.descriptors.Resour
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiAttributeNode;
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
 import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 import com.android.sdklib.SdkConstants;
 import com.android.sdklib.xml.ManifestData;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidator.java
index fd8ad9e..f373ccc 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidator.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidator.java
@@ -18,13 +18,13 @@ package com.android.ide.eclipse.adt.internal.resources;
 
 import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML;
 
-import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.AdtConstants;
+import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.internal.resources.manager.FolderTypeRelationship;
 import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResourceItem;
 import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 
 import org.eclipse.core.resources.IProject;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/configurations/FolderConfiguration.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/configurations/FolderConfiguration.java
index b759e6e..259ed35 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/configurations/FolderConfiguration.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/configurations/FolderConfiguration.java
@@ -16,7 +16,8 @@
 
 package com.android.ide.eclipse.adt.internal.resources.configurations;
 
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
+import com.android.AndroidConstants;
+import com.android.resources.ResourceFolderType;
 
 
 /**
@@ -24,7 +25,6 @@ import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType
  * value which means that the property is not set.
  */
 public final class FolderConfiguration implements Comparable<FolderConfiguration> {
-    public final static String QUALIFIER_SEP = "-"; //$NON-NLS-1$
 
     private final ResourceQualifier[] mQualifiers = new ResourceQualifier[INDEX_COUNT];
 
@@ -404,7 +404,7 @@ public final class FolderConfiguration implements Comparable<FolderConfiguration
             if (qualifier != null) {
                 String segment = qualifier.getFolderSegment();
                 if (segment != null && segment.length() > 0) {
-                    result.append(QUALIFIER_SEP);
+                    result.append(AndroidConstants.RES_QUALIFIER_SEP);
                     result.append(segment);
                 }
             }

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/FolderTypeRelationship.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/FolderTypeRelationship.java
index 168f7fb..b0f1389 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/FolderTypeRelationship.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/FolderTypeRelationship.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.eclipse.adt.internal.resources.manager;
 
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 
 import java.util.ArrayList;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectResources.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectResources.java
index dc68995..3de0f4a 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectResources.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectResources.java
@@ -27,6 +27,7 @@ import com.android.ide.eclipse.adt.internal.sdk.ProjectState;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
 import com.android.ide.eclipse.adt.io.IFolderWrapper;
 import com.android.io.IAbstractFolder;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 import com.android.util.Pair;
 

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolder.java
index ac744c8..270fc3e 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolder.java
@@ -21,6 +21,7 @@ import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfi
 import com.android.ide.eclipse.adt.io.IFileWrapper;
 import com.android.io.IAbstractFile;
 import com.android.io.IAbstractFolder;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 
 import org.eclipse.core.resources.IFile;

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceManager.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceManager.java
index 9293f33..5e5f78d 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceManager.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceManager.java
@@ -16,8 +16,9 @@
 
 package com.android.ide.eclipse.adt.internal.resources.manager;
 
-import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.AndroidConstants;
 import com.android.ide.eclipse.adt.AdtConstants;
+import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.ResourceQualifier;
 import com.android.ide.eclipse.adt.internal.resources.manager.GlobalProjectMonitor.IFileListener;
@@ -29,6 +30,7 @@ import com.android.io.FolderWrapper;
 import com.android.io.IAbstractFile;
 import com.android.io.IAbstractFolder;
 import com.android.io.IAbstractResource;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
@@ -579,7 +581,7 @@ public final class ResourceManager {
      */
     private ResourceFolder processFolder(IAbstractFolder folder, ProjectResources project) {
         // split the name of the folder in segments.
-        String[] folderSegments = folder.getName().split(FolderConfiguration.QUALIFIER_SEP);
+        String[] folderSegments = folder.getName().split(AndroidConstants.RES_QUALIFIER_SEP);
 
         // get the enum for the resource type.
         ResourceFolderType type = ResourceFolderType.getTypeByName(folderSegments[0]);

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java
index ad18ceb..ccf4301 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java
@@ -16,9 +16,10 @@
 
 package com.android.ide.eclipse.adt.internal.sdk;
 
+import static com.android.AndroidConstants.FD_RES_VALUES;
 import static com.android.sdklib.SdkConstants.FD_DATA;
 import static com.android.sdklib.SdkConstants.FD_RES;
-import static com.android.sdklib.SdkConstants.FD_VALUES;
+
 import static java.io.File.separator;
 
 import com.android.ide.common.rendering.LayoutLibrary;
@@ -405,7 +406,7 @@ public class AndroidTargetData {
      * returns the result as a map from resource type to a list of names
      */
     private Map<ResourceType, Collection<String>> readPublicAttributeLists() {
-        String relative = FD_DATA + separator + FD_RES + separator + FD_VALUES + separator +
+        String relative = FD_DATA + separator + FD_RES + separator + FD_RES_VALUES + separator +
             "public.xml"; //$NON-NLS-1$
         File file = new File(mTarget.getLocation(), relative);
         if (file.isFile()) {

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java
index e8ca524..d98d674 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.eclipse.adt.internal.ui;
 
+import com.android.AndroidConstants;
 import com.android.ide.eclipse.adt.internal.resources.configurations.CountryCodeQualifier;
 import com.android.ide.eclipse.adt.internal.resources.configurations.DockModeQualifier;
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
@@ -509,7 +510,7 @@ public class ConfigurationSelector extends Composite {
      */
     public boolean setConfiguration(String folderName) {
         // split the name of the folder in segments.
-        String[] folderSegments = folderName.split(FolderConfiguration.QUALIFIER_SEP);
+        String[] folderSegments = folderName.split(AndroidConstants.RES_QUALIFIER_SEP);
 
         return setConfiguration(folderSegments);
     }

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceChooser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceChooser.java
index 2c0ac44..87d1b75 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceChooser.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceChooser.java
@@ -16,11 +16,11 @@
 
 package com.android.ide.eclipse.adt.internal.ui;
 
+import static com.android.AndroidConstants.FD_RES_VALUES;
 import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML;
 import static com.android.ide.eclipse.adt.AdtConstants.WS_SEP;
 import static com.android.ide.eclipse.adt.internal.editors.resources.descriptors.ResourcesDescriptors.NAME_ATTR;
 import static com.android.sdklib.SdkConstants.FD_RESOURCES;
-import static com.android.sdklib.SdkConstants.FD_VALUES;
 
 import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.internal.editors.AndroidXmlEditor;
@@ -251,7 +251,7 @@ public class ResourceChooser extends AbstractElementListSelectionDialog {
         // Find "dimens.xml" file in res/values/ (or corresponding name for other
         // value types)
         String fileName = type.getName() + 's';
-        String projectPath = FD_RESOURCES + WS_SEP + FD_VALUES + WS_SEP + fileName + '.' + EXT_XML;
+        String projectPath = FD_RESOURCES + WS_SEP + FD_RES_VALUES + WS_SEP + fileName + '.' + EXT_XML;
         IResource member = mProject.findMember(projectPath);
         if (member != null) {
             if (member instanceof IFile) {

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectWizard.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectWizard.java
index ebccf25..b02d1a8 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectWizard.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectWizard.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.eclipse.adt.internal.wizards.newproject;
 
+import com.android.AndroidConstants;
 import com.android.ide.common.layout.LayoutConstants;
 import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.AdtConstants;
@@ -140,17 +141,20 @@ public class NewProjectWizard extends Wizard implements INewWizard {
     private static final String ASSETS_DIRECTORY =
         SdkConstants.FD_ASSETS + AdtConstants.WS_SEP;
     private static final String DRAWABLE_DIRECTORY =
-        SdkConstants.FD_DRAWABLE + AdtConstants.WS_SEP;
+        AndroidConstants.FD_RES_DRAWABLE + AdtConstants.WS_SEP;
     private static final String DRAWABLE_HDPI_DIRECTORY =
-        SdkConstants.FD_DRAWABLE + "-" + Density.HIGH.getResourceValue() + AdtConstants.WS_SEP;   //$NON-NLS-1$
+        AndroidConstants.FD_RES_DRAWABLE + "-" + Density.HIGH.getResourceValue() +   //$NON-NLS-1$
+        AdtConstants.WS_SEP;
     private static final String DRAWABLE_MDPI_DIRECTORY =
-        SdkConstants.FD_DRAWABLE + "-" + Density.MEDIUM.getResourceValue() + AdtConstants.WS_SEP; //$NON-NLS-1$
+        AndroidConstants.FD_RES_DRAWABLE + "-" + Density.MEDIUM.getResourceValue() + //$NON-NLS-1$
+        AdtConstants.WS_SEP;
     private static final String DRAWABLE_LDPI_DIRECTORY =
-        SdkConstants.FD_DRAWABLE + "-" + Density.LOW.getResourceValue() + AdtConstants.WS_SEP;    //$NON-NLS-1$
+        AndroidConstants.FD_RES_DRAWABLE + "-" + Density.LOW.getResourceValue() +    //$NON-NLS-1$
+        AdtConstants.WS_SEP;
     private static final String LAYOUT_DIRECTORY =
-        SdkConstants.FD_LAYOUT + AdtConstants.WS_SEP;
+        AndroidConstants.FD_RES_LAYOUT + AdtConstants.WS_SEP;
     private static final String VALUES_DIRECTORY =
-        SdkConstants.FD_VALUES + AdtConstants.WS_SEP;
+        AndroidConstants.FD_RES_VALUES + AdtConstants.WS_SEP;
     private static final String GEN_SRC_DIRECTORY =
         SdkConstants.FD_GEN_SOURCES + AdtConstants.WS_SEP;
 

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java
index 1cf41fd..8829d76 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java
@@ -17,8 +17,9 @@
 
 package com.android.ide.eclipse.adt.internal.wizards.newxmlfile;
 
-import com.android.ide.eclipse.adt.AdtPlugin;
+import com.android.AndroidConstants;
 import com.android.ide.eclipse.adt.AdtConstants;
+import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.DocumentDescriptor;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.IDescriptorProvider;
@@ -30,13 +31,13 @@ import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper.IProjectFi
 import com.android.ide.eclipse.adt.internal.resources.ResourceNameValidator;
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.ResourceQualifier;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk.TargetChangeListener;
 import com.android.ide.eclipse.adt.internal.ui.ConfigurationSelector;
 import com.android.ide.eclipse.adt.internal.ui.ConfigurationSelector.ConfigurationState;
 import com.android.ide.eclipse.adt.internal.ui.ConfigurationSelector.SelectorMode;
+import com.android.resources.ResourceFolderType;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
 import com.android.util.Pair;
@@ -1023,7 +1024,7 @@ class NewXmlFileCreationPage extends WizardPage {
                 wsFolderPath = wsFolderPath.substring(0, pos);
             }
 
-            String[] folderSegments = wsFolderPath.split(FolderConfiguration.QUALIFIER_SEP);
+            String[] folderSegments = wsFolderPath.split(AndroidConstants.RES_QUALIFIER_SEP);
 
             if (folderSegments.length > 0) {
                 String folderName = folderSegments[0];
@@ -1044,7 +1045,7 @@ class NewXmlFileCreationPage extends WizardPage {
                 // For now, treat a selection of /res/animator as /res/anim/,
                 // though we need to handle this better
                 // TODO: Properly support ANIMATOR templates!
-                if (!selected && folderName.equals(SdkConstants.FD_ANIMATOR)) {
+                if (!selected && folderName.equals(AndroidConstants.FD_RES_ANIMATOR)) {
                     for (TypeInfo type : sTypes) {
                         if (type.getResFolderType() == ResourceFolderType.ANIM) {
                             matches.add(type);

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java
index afb6dcc..5131126 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.eclipse.tests.functests.layoutRendering;
 
+import com.android.AndroidConstants;
 import com.android.ide.common.rendering.LayoutLibrary;
 import com.android.ide.common.rendering.api.ILayoutPullParser;
 import com.android.ide.common.rendering.api.IProjectCallback;
@@ -168,7 +169,7 @@ public class ApiDemosRenderingTest extends SdkTestCase {
         }
 
         // look for the layout folder
-        File layoutFolder = new File(resFolder, SdkConstants.FD_LAYOUT);
+        File layoutFolder = new File(resFolder, AndroidConstants.FD_RES_LAYOUT);
         if (layoutFolder.isDirectory() == false) {
             fail("Sample project has no layout folder!");
         }

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
index 59c1897..2c53bea 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
@@ -21,7 +21,6 @@ import com.android.ide.eclipse.adt.internal.resources.configurations.ResourceQua
 import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFile;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolder;
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 import com.android.ide.eclipse.adt.internal.resources.manager.SingleResourceFile;
 import com.android.ide.eclipse.adt.io.IFileWrapper;
@@ -34,6 +33,7 @@ import com.android.resources.KeyboardState;
 import com.android.resources.Navigation;
 import com.android.resources.NavigationState;
 import com.android.resources.NightMode;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ScreenOrientation;
 import com.android.resources.TouchScreen;
 

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidatorTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidatorTest.java
index 9c2a0c7..2c7c75c 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidatorTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidatorTest.java
@@ -16,7 +16,7 @@
 
 package com.android.ide.eclipse.adt.internal.resources;
 
-import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolderType;
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 
 import java.util.Collections;

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/manager/FolderTypeRelationShipTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/manager/FolderTypeRelationShipTest.java
index f1ce9d9..24ac601 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/manager/FolderTypeRelationShipTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/manager/FolderTypeRelationShipTest.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.eclipse.adt.internal.resources.manager;
 
+import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 
 import junit.framework.TestCase;

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
index 37265b1..99af0db 100644 (file)
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
@@ -16,6 +16,8 @@
 
 package com.android.sdklib;
 
+import com.android.AndroidConstants;
+
 import java.io.File;
 
 /**
@@ -180,28 +182,6 @@ public final class SdkConstants {
     public final static String FD_APK_NATIVE_LIBS = "lib"; //$NON-NLS-1$
     /** Default output folder name, i.e. "bin" */
     public final static String FD_OUTPUT = "bin"; //$NON-NLS-1$
-    /** Default anim resource folder name, i.e. "anim" */
-    public final static String FD_ANIM = "anim"; //$NON-NLS-1$
-    /** Default animator resource folder name, i.e. "animator" */
-    public final static String FD_ANIMATOR = "animator"; //$NON-NLS-1$
-    /** Default color resource folder name, i.e. "color" */
-    public final static String FD_COLOR = "color"; //$NON-NLS-1$
-    /** Default drawable resource folder name, i.e. "drawable" */
-    public final static String FD_DRAWABLE = "drawable"; //$NON-NLS-1$
-    /** Default interpolator resource folder name, i.e. "interpolator" */
-    public final static String FD_INTERPOLATOR = "interpolator"; //$NON-NLS-1$
-    /** Default layout resource folder name, i.e. "layout" */
-    public final static String FD_LAYOUT = "layout"; //$NON-NLS-1$
-    /** Default menu resource folder name, i.e. "menu" */
-    public final static String FD_MENU = "menu"; //$NON-NLS-1$
-    /** Default menu resource folder name, i.e. "mipmap" */
-    public final static String FD_MIPMAP = "mipmap"; //$NON-NLS-1$
-    /** Default values resource folder name, i.e. "values" */
-    public final static String FD_VALUES = "values"; //$NON-NLS-1$
-    /** Default xml resource folder name, i.e. "xml" */
-    public final static String FD_XML = "xml"; //$NON-NLS-1$
-    /** Default raw resource folder name, i.e. "raw" */
-    public final static String FD_RAW = "raw"; //$NON-NLS-1$
     /** proguard output folder for mapping, etc.. files */
     public final static String FD_PROGUARD = "proguard"; //$NON-NLS-1$
 
@@ -336,11 +316,13 @@ public final class SdkConstants {
 
     /** Path of the attrs.xml file relative to a platform folder. */
     public final static String OS_PLATFORM_ATTRS_XML =
-            OS_PLATFORM_RESOURCES_FOLDER + FD_VALUES + File.separator + FN_ATTRS_XML;
+            OS_PLATFORM_RESOURCES_FOLDER + AndroidConstants.FD_RES_VALUES + File.separator +
+            FN_ATTRS_XML;
 
     /** Path of the attrs_manifest.xml file relative to a platform folder. */
     public final static String OS_PLATFORM_ATTRS_MANIFEST_XML =
-            OS_PLATFORM_RESOURCES_FOLDER + FD_VALUES + File.separator + FN_ATTRS_MANIFEST_XML;
+            OS_PLATFORM_RESOURCES_FOLDER + AndroidConstants.FD_RES_VALUES + File.separator +
+            FN_ATTRS_MANIFEST_XML;
 
     /** Path of the layoutlib.jar file relative to a platform folder. */
     public final static String OS_PLATFORM_LAYOUTLIB_JAR =

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
index 16dd8eb..7840b91 100644 (file)
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
@@ -16,6 +16,7 @@
 
 package com.android.sdklib.internal.project;
 
+import com.android.AndroidConstants;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.ISdkLog;
 import com.android.sdklib.SdkConstants;
@@ -325,11 +326,11 @@ public class ProjectCreator {
 
             if (isTestProject == false) {
                 /* Make res files only for non test projects */
-                File valueFolder = createDirs(resourceFolder, SdkConstants.FD_VALUES);
+                File valueFolder = createDirs(resourceFolder, AndroidConstants.FD_RES_VALUES);
                 installTargetTemplate("strings.template", new File(valueFolder, "strings.xml"),
                         keywords, target);
 
-                File layoutFolder = createDirs(resourceFolder, SdkConstants.FD_LAYOUT);
+                File layoutFolder = createDirs(resourceFolder, AndroidConstants.FD_RES_LAYOUT);
                 installTargetTemplate("layout.template", new File(layoutFolder, "main.xml"),
                         keywords, target);