summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2014-02-28 17:18:59 +0100
committerSelim Cinek <cinek@google.com>2014-03-03 18:09:06 +0100
commitffed65886ecd83f52dc1c052897511c95a5f371a (patch)
treee289aab5183961bd4fd5903b7daa5feca8a228ef /AndroidManifest.xml
parent4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373 (diff)
downloadandroid_packages_apps_Trebuchet-ffed65886ecd83f52dc1c052897511c95a5f371a.zip
android_packages_apps_Trebuchet-ffed65886ecd83f52dc1c052897511c95a5f371a.tar.gz
android_packages_apps_Trebuchet-ffed65886ecd83f52dc1c052897511c95a5f371a.tar.bz2
Changed behaviour of the wallpaper picker.
When opening the picker, the currently chosen wallpaper is shown in the background. In this change also the nullpointer was fixed when deleting the currently selected wallpaper and setting it, because we revert to the old wallpaper in that case. When going into the same live wallpaper than the currently selected we are going back to home if the user sets it or goes back now, in order for the user not to loose state. The real fix for this will be done later when the following bug will be fixed: b/13241760 Bug: 12063773 Bug: 13219612 Change-Id: I7c6abb25755eca99c3255278e0884d1ff4749b55
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index be3a28b..d4cd6a2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -106,7 +106,7 @@
<activity
android:name="com.android.launcher3.LauncherWallpaperPickerActivity"
- android:theme="@style/Theme.WallpaperCropper"
+ android:theme="@style/Theme.WallpaperPicker"
android:label="@string/pick_wallpaper"
android:icon="@mipmap/ic_launcher_wallpaper"
android:finishOnCloseSystemDialogs="true"