aboutsummaryrefslogtreecommitdiffstats
path: root/common/src/com/android
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2012-12-03 10:03:07 -0800
committerTor Norbye <tnorbye@google.com>2012-12-03 10:27:54 -0800
commit32654dfbd134559fbf6bec4542d6a4a8105897c9 (patch)
treefc8563ab428eef9d9759421283cb88643dce05b9 /common/src/com/android
parent6c7924f6fea737bf5c87c1a6b845d690b8c46099 (diff)
downloadsdk-32654dfbd134559fbf6bec4542d6a4a8105897c9.zip
sdk-32654dfbd134559fbf6bec4542d6a4a8105897c9.tar.gz
sdk-32654dfbd134559fbf6bec4542d6a4a8105897c9.tar.bz2
Fix rename type, rename package and move type refactorings
This CL updates the various refactorings to properly handle layout refactoring such that it not only updates custom views, but also updates fragment references, tool:context references etc. It also fixes missing manifest updates (such as replacing the parentActivityName attributes). Most importantly, it also fixes bugs where the wrong elements in the manifest could get updated. There are a lot of diffs in this CL because I basically replaced the old refactoring code (which had a lot of custom text change and document manipulation code) with code based on the new resource refactoring, where there is a single iteration of the XML documents. This also improves the emitted refactoring elements such that it only lists each file once. Also updated the unit tests to check additional scenarios; adding a second activity with the same prefix as the first is what revealed the broken document handling in the old code. Change-Id: I7c5959ca6b046ce3dab566663988cdd0389b0e5b
Diffstat (limited to 'common/src/com/android')
-rw-r--r--common/src/com/android/xml/AndroidManifest.java86
1 files changed, 44 insertions, 42 deletions
diff --git a/common/src/com/android/xml/AndroidManifest.java b/common/src/com/android/xml/AndroidManifest.java
index d0f2126..306471e 100644
--- a/common/src/com/android/xml/AndroidManifest.java
+++ b/common/src/com/android/xml/AndroidManifest.java
@@ -34,49 +34,51 @@ import javax.xml.xpath.XPathExpressionException;
*/
public final class AndroidManifest {
- public final static String NODE_MANIFEST = "manifest";
- public final static String NODE_APPLICATION = "application";
- public final static String NODE_ACTIVITY = "activity";
- public final static String NODE_ACTIVITY_ALIAS = "activity-alias";
- public final static String NODE_SERVICE = "service";
- public final static String NODE_RECEIVER = "receiver";
- public final static String NODE_PROVIDER = "provider";
- public final static String NODE_INTENT = "intent-filter";
- public final static String NODE_ACTION = "action";
- public final static String NODE_CATEGORY = "category";
- public final static String NODE_USES_SDK = "uses-sdk";
- public final static String NODE_INSTRUMENTATION = "instrumentation";
- public final static String NODE_USES_LIBRARY = "uses-library";
- public final static String NODE_SUPPORTS_SCREENS = "supports-screens";
- public final static String NODE_USES_CONFIGURATION = "uses-configuration";
- public final static String NODE_USES_FEATURE = "uses-feature";
-
- public final static String ATTRIBUTE_PACKAGE = "package";
- public final static String ATTRIBUTE_VERSIONCODE = "versionCode";
- public final static String ATTRIBUTE_NAME = "name";
- public final static String ATTRIBUTE_REQUIRED = "required";
- public final static String ATTRIBUTE_GLESVERSION = "glEsVersion";
- public final static String ATTRIBUTE_PROCESS = "process";
- public final static String ATTRIBUTE_DEBUGGABLE = "debuggable";
- public final static String ATTRIBUTE_LABEL = "label";
- public final static String ATTRIBUTE_ICON = "icon";
- public final static String ATTRIBUTE_MIN_SDK_VERSION = "minSdkVersion";
- public final static String ATTRIBUTE_TARGET_SDK_VERSION = "targetSdkVersion";
- public final static String ATTRIBUTE_TARGET_PACKAGE = "targetPackage";
- public final static String ATTRIBUTE_TARGET_ACTIVITY = "targetActivity";
- public final static String ATTRIBUTE_MANAGE_SPACE_ACTIVITY = "manageSpaceActivity";
- public final static String ATTRIBUTE_EXPORTED = "exported";
- public final static String ATTRIBUTE_RESIZEABLE = "resizeable";
- public final static String ATTRIBUTE_ANYDENSITY = "anyDensity";
- public final static String ATTRIBUTE_SMALLSCREENS = "smallScreens";
- public final static String ATTRIBUTE_NORMALSCREENS = "normalScreens";
- public final static String ATTRIBUTE_LARGESCREENS = "largeScreens";
- public final static String ATTRIBUTE_REQ_5WAYNAV = "reqFiveWayNav";
- public final static String ATTRIBUTE_REQ_NAVIGATION = "reqNavigation";
- public final static String ATTRIBUTE_REQ_HARDKEYBOARD = "reqHardKeyboard";
- public final static String ATTRIBUTE_REQ_KEYBOARDTYPE = "reqKeyboardType";
- public final static String ATTRIBUTE_REQ_TOUCHSCREEN = "reqTouchScreen";
+ public static final String NODE_MANIFEST = "manifest";
+ public static final String NODE_APPLICATION = "application";
+ public static final String NODE_ACTIVITY = "activity";
+ public static final String NODE_ACTIVITY_ALIAS = "activity-alias";
+ public static final String NODE_SERVICE = "service";
+ public static final String NODE_RECEIVER = "receiver";
+ public static final String NODE_PROVIDER = "provider";
+ public static final String NODE_INTENT = "intent-filter";
+ public static final String NODE_ACTION = "action";
+ public static final String NODE_CATEGORY = "category";
+ public static final String NODE_USES_SDK = "uses-sdk";
+ public static final String NODE_INSTRUMENTATION = "instrumentation";
+ public static final String NODE_USES_LIBRARY = "uses-library";
+ public static final String NODE_SUPPORTS_SCREENS = "supports-screens";
+ public static final String NODE_USES_CONFIGURATION = "uses-configuration";
+ public static final String NODE_USES_FEATURE = "uses-feature";
+
+ public static final String ATTRIBUTE_PACKAGE = "package";
+ public static final String ATTRIBUTE_VERSIONCODE = "versionCode";
+ public static final String ATTRIBUTE_NAME = "name";
+ public static final String ATTRIBUTE_REQUIRED = "required";
+ public static final String ATTRIBUTE_GLESVERSION = "glEsVersion";
+ public static final String ATTRIBUTE_PROCESS = "process";
+ public static final String ATTRIBUTE_DEBUGGABLE = "debuggable";
+ public static final String ATTRIBUTE_LABEL = "label";
+ public static final String ATTRIBUTE_ICON = "icon";
+ public static final String ATTRIBUTE_MIN_SDK_VERSION = "minSdkVersion";
+ public static final String ATTRIBUTE_TARGET_SDK_VERSION = "targetSdkVersion";
+ public static final String ATTRIBUTE_TARGET_PACKAGE = "targetPackage";
+ public static final String ATTRIBUTE_TARGET_ACTIVITY = "targetActivity";
+ public static final String ATTRIBUTE_MANAGE_SPACE_ACTIVITY = "manageSpaceActivity";
+ public static final String ATTRIBUTE_EXPORTED = "exported";
+ public static final String ATTRIBUTE_RESIZEABLE = "resizeable";
+ public static final String ATTRIBUTE_ANYDENSITY = "anyDensity";
+ public static final String ATTRIBUTE_SMALLSCREENS = "smallScreens";
+ public static final String ATTRIBUTE_NORMALSCREENS = "normalScreens";
+ public static final String ATTRIBUTE_LARGESCREENS = "largeScreens";
+ public static final String ATTRIBUTE_REQ_5WAYNAV = "reqFiveWayNav";
+ public static final String ATTRIBUTE_REQ_NAVIGATION = "reqNavigation";
+ public static final String ATTRIBUTE_REQ_HARDKEYBOARD = "reqHardKeyboard";
+ public static final String ATTRIBUTE_REQ_KEYBOARDTYPE = "reqKeyboardType";
+ public static final String ATTRIBUTE_REQ_TOUCHSCREEN = "reqTouchScreen";
public static final String ATTRIBUTE_THEME = "theme";
+ public static final String ATTRIBUTE_BACKUP_AGENT = "backupAgent";
+ public static final String ATTRIBUTE_PARENT_ACTIVITY_NAME = "parentActivityName";
/**
* Returns an {@link IAbstractFile} object representing the manifest for the given project.