summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-09-19 19:01:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-19 19:01:38 +0000
commit437dec39ee89ba6817967ae5bd75d663eecad5db (patch)
tree41e9f73bbb500d32ac5a5fd832bb097276c01b32 /res
parentb94f3f804f3954666c73e0564391444ec77dc4d4 (diff)
parent3f452c87db9c3639285eafd17fff6a6f9d28da44 (diff)
downloadandroid_packages_apps_Trebuchet-437dec39ee89ba6817967ae5bd75d663eecad5db.tar.gz
android_packages_apps_Trebuchet-437dec39ee89ba6817967ae5bd75d663eecad5db.tar.bz2
android_packages_apps_Trebuchet-437dec39ee89ba6817967ae5bd75d663eecad5db.zip
Merge "Adding some assets / fixing a couple bugs" into jb-ub-now-indigo-rose
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_gel_setting_icn.pngbin0 -> 1694 bytes
-rw-r--r--res/drawable-hdpi/ic_gel_wallpaper_icn.pngbin0 -> 1456 bytes
-rw-r--r--res/drawable-hdpi/ic_gel_widget_icn.pngbin0 -> 1111 bytes
-rw-r--r--res/drawable-mdpi/ic_gel_setting_icn.pngbin0 -> 1082 bytes
-rw-r--r--res/drawable-mdpi/ic_gel_wallpaper_icn.pngbin0 -> 1025 bytes
-rw-r--r--res/drawable-mdpi/ic_gel_widget_icn.pngbin0 -> 898 bytes
-rw-r--r--res/drawable-xhdpi/ic_gel_setting_icn.pngbin0 -> 2386 bytes
-rw-r--r--res/drawable-xhdpi/ic_gel_wallpaper_icn.pngbin0 -> 1949 bytes
-rw-r--r--res/drawable-xhdpi/ic_gel_widget_icn.pngbin0 -> 1386 bytes
-rw-r--r--res/drawable-xxhdpi/ic_gel_setting_icn.pngbin0 -> 2937 bytes
-rw-r--r--res/drawable-xxhdpi/ic_gel_wallpaper_icn.pngbin0 -> 2602 bytes
-rw-r--r--res/drawable-xxhdpi/ic_gel_widget_icn.pngbin0 -> 1910 bytes
-rw-r--r--res/layout/overview_panel.xml6
13 files changed, 6 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_gel_setting_icn.png b/res/drawable-hdpi/ic_gel_setting_icn.png
new file mode 100644
index 000000000..f80594710
--- /dev/null
+++ b/res/drawable-hdpi/ic_gel_setting_icn.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_gel_wallpaper_icn.png b/res/drawable-hdpi/ic_gel_wallpaper_icn.png
new file mode 100644
index 000000000..ad13c856d
--- /dev/null
+++ b/res/drawable-hdpi/ic_gel_wallpaper_icn.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_gel_widget_icn.png b/res/drawable-hdpi/ic_gel_widget_icn.png
new file mode 100644
index 000000000..2bfd2c17b
--- /dev/null
+++ b/res/drawable-hdpi/ic_gel_widget_icn.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_gel_setting_icn.png b/res/drawable-mdpi/ic_gel_setting_icn.png
new file mode 100644
index 000000000..096e6bcc8
--- /dev/null
+++ b/res/drawable-mdpi/ic_gel_setting_icn.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_gel_wallpaper_icn.png b/res/drawable-mdpi/ic_gel_wallpaper_icn.png
new file mode 100644
index 000000000..61a7b7ee1
--- /dev/null
+++ b/res/drawable-mdpi/ic_gel_wallpaper_icn.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_gel_widget_icn.png b/res/drawable-mdpi/ic_gel_widget_icn.png
new file mode 100644
index 000000000..8a2cb7a2f
--- /dev/null
+++ b/res/drawable-mdpi/ic_gel_widget_icn.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_gel_setting_icn.png b/res/drawable-xhdpi/ic_gel_setting_icn.png
new file mode 100644
index 000000000..fe17163b1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_gel_setting_icn.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_gel_wallpaper_icn.png b/res/drawable-xhdpi/ic_gel_wallpaper_icn.png
new file mode 100644
index 000000000..d9472d981
--- /dev/null
+++ b/res/drawable-xhdpi/ic_gel_wallpaper_icn.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_gel_widget_icn.png b/res/drawable-xhdpi/ic_gel_widget_icn.png
new file mode 100644
index 000000000..da6e3e9c2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_gel_widget_icn.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_gel_setting_icn.png b/res/drawable-xxhdpi/ic_gel_setting_icn.png
new file mode 100644
index 000000000..813716def
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_gel_setting_icn.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png b/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png
new file mode 100644
index 000000000..352544606
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_gel_widget_icn.png b/res/drawable-xxhdpi/ic_gel_widget_icn.png
new file mode 100644
index 000000000..934243706
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_gel_widget_icn.png
Binary files differ
diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml
index e05adf2b9..e4f4c8960 100644
--- a/res/layout/overview_panel.xml
+++ b/res/layout/overview_panel.xml
@@ -26,6 +26,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/widget_button_text"
+ android:drawablePadding="4dp"
+ android:drawableTop="@drawable/ic_gel_widget_icn"
android:textSize="18dp"/>
<Space
android:layout_width="@dimen/overview_panel_buttonSpacing"
@@ -35,6 +37,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wallpaper_button_text"
+ android:drawablePadding="4dp"
+ android:drawableTop="@drawable/ic_gel_wallpaper_icn"
android:textSize="18dp" />
<Space
android:layout_width="@dimen/overview_panel_buttonSpacing"
@@ -44,5 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_button_text"
+ android:drawablePadding="4dp"
+ android:drawableTop="@drawable/ic_gel_setting_icn"
android:textSize="18dp" />
</LinearLayout>