summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-09-18 00:45:45 +0200
committerMichael Jurka <mikejurka@google.com>2013-09-18 00:45:45 +0200
commit42a7174255b2d2e8f5896ab02f3b0611dabcc4a1 (patch)
tree0d22770c3aee09a06c9f504f0743ad62a1111b52 /res
parent578e09f7a8995db84f5c2a1f39aab3825ea7fe51 (diff)
downloadandroid_packages_apps_Trebuchet-42a7174255b2d2e8f5896ab02f3b0611dabcc4a1.tar.gz
android_packages_apps_Trebuchet-42a7174255b2d2e8f5896ab02f3b0611dabcc4a1.tar.bz2
android_packages_apps_Trebuchet-42a7174255b2d2e8f5896ab02f3b0611dabcc4a1.zip
Update styling of tile to pick image as wallpaper
Bug: 10743257
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_images.pngbin0 -> 1935 bytes
-rw-r--r--res/drawable-mdpi/ic_images.pngbin0 -> 1332 bytes
-rw-r--r--res/drawable-xhdpi/ic_images.pngbin0 -> 2480 bytes
-rw-r--r--res/drawable-xxhdpi/ic_images.pngbin0 -> 2097 bytes
-rw-r--r--res/layout/wallpaper_picker_gallery_item.xml5
-rw-r--r--res/values/strings.xml4
6 files changed, 6 insertions, 3 deletions
diff --git a/res/drawable-hdpi/ic_images.png b/res/drawable-hdpi/ic_images.png
new file mode 100644
index 000000000..0003c6c65
--- /dev/null
+++ b/res/drawable-hdpi/ic_images.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_images.png b/res/drawable-mdpi/ic_images.png
new file mode 100644
index 000000000..aabc1237a
--- /dev/null
+++ b/res/drawable-mdpi/ic_images.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_images.png b/res/drawable-xhdpi/ic_images.png
new file mode 100644
index 000000000..3f21faf8f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_images.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_images.png b/res/drawable-xxhdpi/ic_images.png
new file mode 100644
index 000000000..d00db9a00
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_images.png
Binary files differ
diff --git a/res/layout/wallpaper_picker_gallery_item.xml b/res/layout/wallpaper_picker_gallery_item.xml
index 7f30f8040..ecfba600e 100644
--- a/res/layout/wallpaper_picker_gallery_item.xml
+++ b/res/layout/wallpaper_picker_gallery_item.xml
@@ -27,11 +27,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#66000000"
- android:scaleType="fitXY" />
+ android:scaleType="centerCrop" />
<TextView
android:id="@+id/wallpaper_item_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
+ android:text="@string/pick_image"
+ android:drawableTop="@drawable/ic_images"
+ android:drawablePadding="4dp"
android:textColor="#FFFFFFFF"/>
</com.android.launcher3.CheckableFrameLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e04902a16..6b9b07056 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -41,8 +41,8 @@
<!-- Label on button to delete wallpaper(s) -->
<string name="wallpaper_delete">Delete</string>
- <!-- Label on button in Wallpaper Picker that launches Gallery app -->
- <string name="gallery">Gallery</string>
+ <!-- Label on button in Wallpaper Picker to pick an image -->
+ <string name="pick_image">Pick image</string>
<!-- Option in "Select wallpaper from" dialog box -->
<string name="pick_wallpaper">Wallpapers</string>
<!-- Title of activity for cropping wallpapers -->