diff options
| author | Selim Cinek <cinek@google.com> | 2014-02-28 17:18:59 +0100 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2014-03-03 18:09:06 +0100 |
| commit | ffed65886ecd83f52dc1c052897511c95a5f371a (patch) | |
| tree | e289aab5183961bd4fd5903b7daa5feca8a228ef /WallpaperPicker/res | |
| parent | 4f462f4a8b9fc6897d9fab9ad31c06e0b8f79373 (diff) | |
| download | android_packages_apps_Trebuchet-ffed65886ecd83f52dc1c052897511c95a5f371a.tar.gz android_packages_apps_Trebuchet-ffed65886ecd83f52dc1c052897511c95a5f371a.tar.bz2 android_packages_apps_Trebuchet-ffed65886ecd83f52dc1c052897511c95a5f371a.zip | |
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.xml | 23 | ||||
| -rw-r--r-- | WallpaperPicker/res/values/styles.xml | 10 |
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 2a0188ae2..8e349b732 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 6d600bcdc..16b11f279 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> |