summaryrefslogtreecommitdiffstats
path: root/WallpaperPicker/res
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2014-02-28 17:18:59 +0100
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:29 -0700
commit5a8139c9079a4d9a85a14e86fc95dfddc16d5638 (patch)
treee9ca20982a8ca8f419e0c5f0f5261b7530c7f62c /WallpaperPicker/res
parent1a835b1bcf20a6cbbf50deeb19fd205b4268efa7 (diff)
downloadandroid_packages_apps_Trebuchet-5a8139c9079a4d9a85a14e86fc95dfddc16d5638.zip
android_packages_apps_Trebuchet-5a8139c9079a4d9a85a14e86fc95dfddc16d5638.tar.gz
android_packages_apps_Trebuchet-5a8139c9079a4d9a85a14e86fc95dfddc16d5638.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 'WallpaperPicker/res')
-rw-r--r--WallpaperPicker/res/layout/actionbar_set_wallpaper.xml23
-rw-r--r--WallpaperPicker/res/values/styles.xml10
2 files changed, 20 insertions, 13 deletions
diff --git a/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
index 2a0188a..8e349b7 100644
--- a/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
+++ b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
@@ -18,18 +18,15 @@
*/
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="?android:actionButtonStyle"
+<com.android.launcher3.AlphaDisableableButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/ActionBarSetWallpaperStyle"
android:id="@+id/set_wallpaper_button"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
- <TextView style="?android:actionBarTabTextStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start|center_vertical"
- android:paddingRight="20dp"
- android:drawableLeft="@drawable/ic_actionbar_accept"
- android:drawablePadding="8dp"
- android:gravity="center_vertical"
- android:text="@string/wallpaper_instructions" />
-</FrameLayout>
+ android:layout_height="match_parent"
+ android:paddingRight="20dp"
+ android:drawableLeft="@drawable/ic_actionbar_accept"
+ android:drawablePadding="8dp"
+ android:gravity="start|center_vertical"
+ android:text="@string/wallpaper_instructions">
+</com.android.launcher3.AlphaDisableableButton>
diff --git a/WallpaperPicker/res/values/styles.xml b/WallpaperPicker/res/values/styles.xml
index 6d600bc..16b11f2 100644
--- a/WallpaperPicker/res/values/styles.xml
+++ b/WallpaperPicker/res/values/styles.xml
@@ -24,6 +24,12 @@
<item name="android:windowActionBarOverlay">true</item>
</style>
+ <style name="Theme.WallpaperPicker" parent="Theme.WallpaperCropper">
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
+ <item name="android:windowShowWallpaper">true</item>
+ </style>
+
<style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar">
<item name="android:displayOptions">showCustom</item>
<item name="android:background">#88000000</item>
@@ -31,4 +37,8 @@
<style name="Theme" parent="@android:style/Theme.Holo.Wallpaper.NoTitleBar">
</style>
+
+ <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.Holo.ActionButton">
+ <item name="android:textColor">#ffffffff</item>
+ </style>
</resources>