summaryrefslogtreecommitdiffstats
path: root/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2014-01-23 13:22:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-23 13:22:29 +0000
commit391f1a8062a17ec0865128a910e6d90049c352d5 (patch)
tree293e2552359dbc081082112aaf4c2122cbd889b1 /WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
parent4195da42b77e1f0bf69f2d36583cdd176ecc5288 (diff)
parent849aff7553a5daffa34b4c38d1d29dec5a87fde1 (diff)
downloadandroid_packages_apps_Trebuchet-391f1a8062a17ec0865128a910e6d90049c352d5.tar.gz
android_packages_apps_Trebuchet-391f1a8062a17ec0865128a910e6d90049c352d5.tar.bz2
android_packages_apps_Trebuchet-391f1a8062a17ec0865128a910e6d90049c352d5.zip
Merge "Disable Set Wallpaper button while loading image" into ub-now-lunchbox
Diffstat (limited to 'WallpaperPicker/res/layout/actionbar_set_wallpaper.xml')
-rw-r--r--WallpaperPicker/res/layout/actionbar_set_wallpaper.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
index 1622742a5..2a0188ae2 100644
--- a/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
+++ b/WallpaperPicker/res/layout/actionbar_set_wallpaper.xml
@@ -20,6 +20,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:actionButtonStyle"
+ android:id="@+id/set_wallpaper_button"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView style="?android:actionBarTabTextStyle"