summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-10-17 11:32:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-17 11:32:20 -0700
commit0661577551321d522d3c822d19dc79f9f40d274c (patch)
treed9da65b2b3d6c4f2e0660e23ef2b492dd241d363
parenteb95dde9d6b5f81832225dd0d2f78adfb378815b (diff)
parent6029d75e75c54ce6f4e69a5dde2cdbc993d772b7 (diff)
downloadandroid_packages_apps_Trebuchet-0661577551321d522d3c822d19dc79f9f40d274c.tar.gz
android_packages_apps_Trebuchet-0661577551321d522d3c822d19dc79f9f40d274c.tar.bz2
android_packages_apps_Trebuchet-0661577551321d522d3c822d19dc79f9f40d274c.zip
am 6029d75e: Merge "Run wallpaper chooser in a separate process" into ics-mr0
* commit '6029d75e75c54ce6f4e69a5dde2cdbc993d772b7': Run wallpaper chooser in a separate process
-rw-r--r--AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dd9120fe4..cbb06f6e9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,7 +83,8 @@
style="@style/Theme.WallpaperPicker"
android:label="@string/pick_wallpaper"
android:icon="@drawable/ic_launcher_wallpaper"
- android:finishOnCloseSystemDialogs="true">
+ android:finishOnCloseSystemDialogs="true"
+ android:process=":wallpaper_chooser">
<intent-filter>
<action android:name="android.intent.action.SET_WALLPAPER" />
<category android:name="android.intent.category.DEFAULT" />