summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-09-12 22:15:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-12 22:15:03 +0000
commit80521d95f96f6eb630c269f899ecc28b809fb5ba (patch)
tree9d27d0a45761d52036346a52936e42ead85a3a67 /res/layout
parente763ad1d1427977cfac494fc62cc637a69b91755 (diff)
parentd6dc6043ad29c84511b7cd1c60a4bb72279fb50a (diff)
downloadandroid_packages_apps_Trebuchet-80521d95f96f6eb630c269f899ecc28b809fb5ba.tar.gz
android_packages_apps_Trebuchet-80521d95f96f6eb630c269f899ecc28b809fb5ba.tar.bz2
android_packages_apps_Trebuchet-80521d95f96f6eb630c269f899ecc28b809fb5ba.zip
Merge "Adding ability to delete previously saved wallpapers" into jb-ub-now-indigo-rose
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/wallpaper_picker_gallery_item.xml5
-rw-r--r--res/layout/wallpaper_picker_item.xml5
2 files changed, 6 insertions, 4 deletions
diff --git a/res/layout/wallpaper_picker_gallery_item.xml b/res/layout/wallpaper_picker_gallery_item.xml
index b42b98afb..7f30f8040 100644
--- a/res/layout/wallpaper_picker_gallery_item.xml
+++ b/res/layout/wallpaper_picker_gallery_item.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.CheckableFrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/wallpaperThumbnailWidth"
android:layout_height="@dimen/wallpaperThumbnailHeight"
android:focusable="true"
@@ -33,4 +34,4 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="#FFFFFFFF"/>
-</FrameLayout>
+</com.android.launcher3.CheckableFrameLayout>
diff --git a/res/layout/wallpaper_picker_item.xml b/res/layout/wallpaper_picker_item.xml
index c73bd73f2..06f01c94d 100644
--- a/res/layout/wallpaper_picker_item.xml
+++ b/res/layout/wallpaper_picker_item.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.CheckableFrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/wallpaperThumbnailWidth"
android:layout_height="@dimen/wallpaperThumbnailHeight"
android:focusable="true"
@@ -26,4 +27,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY" />
-</FrameLayout>
+</com.android.launcher3.CheckableFrameLayout>