diff options
5 files changed, 18 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceType.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceType.java index 4555913..0312f44 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceType.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceType.java @@ -21,6 +21,7 @@ package com.android.ide.eclipse.adt.internal.resources; */ public enum ResourceType { ANIM("anim", "Animation"), //$NON-NLS-1$ + ANIMATOR("animator", "Animator"), //$NON-NLS-1$ ARRAY("array", "Array", "string-array", "integer-array"), //$NON-NLS-1$ //$NON-NLS-3$ //$NON-NLS-4$ ATTR("attr", "Attr"), //$NON-NLS-1$ BOOL("bool", "Boolean"), //$NON-NLS-1$ @@ -31,6 +32,7 @@ public enum ResourceType { FRACTION("fraction", "Fraction"), //$NON-NLS-1$ ID("id", "ID"), //$NON-NLS-1$ INTEGER("integer", "Integer"), //$NON-NLS-1$ + INTERPOLATOR("interpolator", "Interpolator"), //$NON-NLS-1$ LAYOUT("layout", "Layout"), //$NON-NLS-1$ MENU("menu", "Menu"), //$NON-NLS-1$ PLURALS("plurals", "Plurals"), //$NON-NLS-1$ 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 c96182d..3a9c7a1 100644 --- 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 @@ -44,6 +44,7 @@ public final class FolderTypeRelationship { new HashMap<ResourceFolderType, List<ResourceType>>(); add(ResourceType.ANIM, ResourceFolderType.ANIM, typeToFolderMap, folderToTypeMap); + add(ResourceType.ANIMATOR, ResourceFolderType.ANIMATOR, typeToFolderMap, folderToTypeMap); add(ResourceType.ARRAY, ResourceFolderType.VALUES, typeToFolderMap, folderToTypeMap); add(ResourceType.ATTR, ResourceFolderType.VALUES, typeToFolderMap, folderToTypeMap); add(ResourceType.BOOL, ResourceFolderType.VALUES, typeToFolderMap, folderToTypeMap); @@ -57,6 +58,8 @@ public final class FolderTypeRelationship { add(ResourceType.FRACTION, ResourceFolderType.VALUES, typeToFolderMap, folderToTypeMap); add(ResourceType.ID, ResourceFolderType.VALUES, typeToFolderMap, folderToTypeMap); add(ResourceType.INTEGER, ResourceFolderType.VALUES, typeToFolderMap, folderToTypeMap); + add(ResourceType.INTERPOLATOR, ResourceFolderType.INTERPOLATOR, typeToFolderMap, + folderToTypeMap); add(ResourceType.LAYOUT, ResourceFolderType.LAYOUT, typeToFolderMap, folderToTypeMap); add(ResourceType.MENU, ResourceFolderType.MENU, typeToFolderMap, folderToTypeMap); add(ResourceType.PLURALS, ResourceFolderType.VALUES, typeToFolderMap, folderToTypeMap); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolderType.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolderType.java index 735a23c..2243e6b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolderType.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ResourceFolderType.java @@ -24,8 +24,10 @@ import com.android.sdklib.SdkConstants; */ 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), RAW(SdkConstants.FD_RAW), diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/SingleResourceFile.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/SingleResourceFile.java index 4e085ad..c282884 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/SingleResourceFile.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/SingleResourceFile.java @@ -134,8 +134,13 @@ public class SingleResourceFile extends ResourceFile { // get the name from the filename. String name = getFile().getName(); - if (type == ResourceType.ANIM || type == ResourceType.LAYOUT || type == ResourceType.MENU || - type == ResourceType.COLOR || type == ResourceType.XML) { + if (type == ResourceType.ANIM || + type == ResourceType.ANIMATOR || + type == ResourceType.COLOR || + type == ResourceType.INTERPOLATOR || + type == ResourceType.LAYOUT || + type == ResourceType.MENU || + type == ResourceType.XML) { Matcher m = sXmlPattern.matcher(name); if (m.matches()) { return m.group(1); diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java index e42ac6f..b2c1326 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java @@ -172,10 +172,14 @@ public final class SdkConstants { 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" */ |