Merge branch 'themes-1.5r2' into themes-eclair

Conflicts:
	api/current.xml
	core/java/android/app/ActivityThread.java
	core/java/android/app/ApplicationContext.java
	core/java/android/app/Dialog.java
	core/java/android/app/SearchDialog.java
	core/java/android/content/Context.java
	core/java/android/content/Intent.java
	core/java/android/content/pm/PackageInfo.java
	core/java/android/content/pm/PackageParser.java
	core/java/android/content/res/Configuration.java
	core/java/android/content/res/Resources.java
	core/java/android/widget/RemoteViews.java
	core/java/android/widget/TabWidget.java
	core/java/com/android/internal/os/ZygoteInit.java
	core/jni/android_util_AssetManager.cpp
	core/res/AndroidManifest.xml
	core/res/res/layout/search_dropdown_item_2line.xml
	core/res/res/layout/select_dialog_item.xml
	core/res/res/layout/select_dialog_multichoice.xml
	core/res/res/layout/select_dialog_singlechoice.xml
	core/res/res/layout/tab_indicator.xml
	core/res/res/values/attrs.xml
	core/res/res/values/public.xml
	core/res/res/values/strings.xml
	core/res/res/values/themes.xml
	libs/utils/Android.mk
	libs/utils/AssetManager.cpp
	media/java/android/media/RingtoneManager.java
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/am/ActivityManagerService.java
	services/java/com/android/server/status/StatusBarService.java
	tools/aapt/Main.cpp

1 files changed, 11 insertions, 2 deletions

diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp
index 98286c0..735751c 100644
--- a/tools/aapt/Main.cpp
+++ b/tools/aapt/Main.cpp
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <assert.h>
+#include <ctype.h>
 
 using namespace android;
 
@@ -55,7 +56,7 @@ void usage(void)
         "   xmltree          Print the compiled xmls in the given assets.\n"
         "   xmlstrings       Print the strings of the given compiled xml assets.\n\n", gProgName);
     fprintf(stderr,
-        " %s p[ackage] [-d][-f][-m][-u][-v][-x][-z][-M AndroidManifest.xml] \\\n"
+        " %s p[ackage] [-d][-f][-m][-u][-v][-x[ extending-resource-id]][-z][-M AndroidManifest.xml] \\\n"
         "        [-0 extension [-0 extension ...]] [-g tolerance] [-j jarfile] \\\n"
         "        [--min-sdk-version VAL] [--target-sdk-version VAL] \\\n"
         "        [--max-sdk-version VAL] [--app-version VAL] \\\n"
@@ -106,7 +107,7 @@ void usage(void)
 #endif
         "   -u  update existing packages (add new, replace older, remove deleted files)\n"
         "   -v  verbose output\n"
-        "   -x  create extending (non-application) resource IDs\n"
+        "   -x  either create or assign (if specified) extending (non-application) resource IDs\n"
         "   -z  require localization of resource attributes marked with\n"
         "       localization=\"suggested\"\n"
         "   -A  additional directory in which to find raw asset files\n"
@@ -253,6 +254,14 @@ int main(int argc, char* const argv[])
                 break;
             case 'x':
                 bundle.setExtending(true);
+                argc--;
+                argv++;
+                if (!argc || !isdigit(argv[0][0])) {
+                    argc++;
+                    argv--;
+                } else {
+                    bundle.setExtendedPackageId(atoi(argv[0]));
+                }
                 break;
             case 'z':
                 bundle.setRequireLocalization(true);