diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-03-09 15:03:20 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-03-09 17:18:11 -0800 |
| commit | 12687cf14426e50a8646fec19cddd127a0b13121 (patch) | |
| tree | 53a1fdab98e8eda7e5c7e8b4ae4f83de79bd3806 | |
| parent | ccdc875e68477261fd00a1fb1435e4d1ee6b521d (diff) | |
| download | android_packages_apps_Trebuchet-12687cf14426e50a8646fec19cddd127a0b13121.tar.gz android_packages_apps_Trebuchet-12687cf14426e50a8646fec19cddd127a0b13121.tar.bz2 android_packages_apps_Trebuchet-12687cf14426e50a8646fec19cddd127a0b13121.zip | |
Allow shared user id and process to be set via overlays.
This fiddles the manifest to allow the app's shared user id and
process to be changed at build time via resource overlays, so we
can build launcher to run in the acore process for low-end devices.
Also switches the cert of launcher back to shared, to allow for
this. (Note this only really matters if the shared user id is set,
otherwise launcher will still get its own uid.)
Change-Id: I0bd0a06e1442c4bfe5ceb2d438cb58f29d911578
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | res/values/strings.xml | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index dda7f0c4e..dc72ec6db 100644 --- a/Android.mk +++ b/Android.mk @@ -24,6 +24,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := Launcher2 +LOCAL_CERTIFICATE := shared LOCAL_OVERRIDES_PACKAGES := Home diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 13682367b..84ee59909 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,7 +19,9 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.launcher"> + package="com.android.launcher" + android:sharedUserId="@string/sharedUserId" + > <original-package android:name="com.android.launcher2" /> @@ -62,6 +64,7 @@ <application android:name="com.android.launcher2.LauncherApplication" + android:process="@string/process" android:label="@string/application_name" android:icon="@drawable/ic_launcher_home"> diff --git a/res/values/strings.xml b/res/values/strings.xml index 35d47338a..ec4fd9599 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -18,6 +18,13 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Manifest configuration. --> + <skip /> + <!-- Do not translate. android:sharedUserId of this application. --> + <string name="sharedUserId" translate="false"><xliff:g id="x"></xliff:g></string> + <!-- Do not translate. android:process of this application. --> + <string name="process" translate="false"><xliff:g id="x"></xliff:g></string> + <!-- General --> <skip /> <!-- Application name --> |