summaryrefslogtreecommitdiffstats
path: root/packages/WallpaperCropper
diff options
context:
space:
mode:
authorChristoph Studer <chstuder@google.com>2014-10-10 17:14:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-10 17:14:50 +0000
commitd55008d4b78c8f90a3e52565d656f91e6f07142d (patch)
tree74af3544903e28cd3a91eabe04da3e49d015203a /packages/WallpaperCropper
parentfd9bfce697143d8a6ac88cb03a66bdaeb51b39c1 (diff)
parentefeb94a87d5598b486299202e35a72d4e46cde8b (diff)
downloadframeworks_base-d55008d4b78c8f90a3e52565d656f91e6f07142d.zip
frameworks_base-d55008d4b78c8f90a3e52565d656f91e6f07142d.tar.gz
frameworks_base-d55008d4b78c8f90a3e52565d656f91e6f07142d.tar.bz2
am efeb94a8: am a6a6f4b2: am a2830b7d: am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev
* commit 'efeb94a87d5598b486299202e35a72d4e46cde8b': WallpaperCropper: Use white color for action bar
Diffstat (limited to 'packages/WallpaperCropper')
-rw-r--r--packages/WallpaperCropper/res/layout/actionbar_set_wallpaper.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/WallpaperCropper/res/layout/actionbar_set_wallpaper.xml b/packages/WallpaperCropper/res/layout/actionbar_set_wallpaper.xml
index 2a0188a..54f8ff3 100644
--- a/packages/WallpaperCropper/res/layout/actionbar_set_wallpaper.xml
+++ b/packages/WallpaperCropper/res/layout/actionbar_set_wallpaper.xml
@@ -31,5 +31,6 @@
android:drawableLeft="@drawable/ic_actionbar_accept"
android:drawablePadding="8dp"
android:gravity="center_vertical"
- android:text="@string/wallpaper_instructions" />
+ android:text="@string/wallpaper_instructions"
+ android:textColor="@android:color/white" />
</FrameLayout>