summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-09-08 17:27:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-08 17:27:13 -0700
commit3994035966f2d402d5faf355522424cadadb3aa3 (patch)
tree4c7537e61bf856ec8760dac7e4088dda8ce71581 /res
parent859736e78a643bfa28bbd631080b0e7172916e31 (diff)
parent7ed3774638133ac603e92ca3174ecdd151269cca (diff)
downloadandroid_packages_apps_Trebuchet-3994035966f2d402d5faf355522424cadadb3aa3.tar.gz
android_packages_apps_Trebuchet-3994035966f2d402d5faf355522424cadadb3aa3.tar.bz2
android_packages_apps_Trebuchet-3994035966f2d402d5faf355522424cadadb3aa3.zip
Merge "Bug Fixing"
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/hotseat.xml1
-rw-r--r--res/layout-port/hotseat.xml1
-rw-r--r--res/layout/wallpaper_chooser.xml3
-rw-r--r--res/layout/wallpaper_item.xml1
4 files changed, 4 insertions, 2 deletions
diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml
index f6d234709..c0c87aff7 100644
--- a/res/layout-land/hotseat.xml
+++ b/res/layout-land/hotseat.xml
@@ -16,6 +16,7 @@
<com.android.launcher2.Hotseat
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ android:background="@drawable/hotseat_bg_panel"
launcher:cellCountX="1"
launcher:cellCountY="5">
<com.android.launcher2.CellLayout
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
index ee59a6ab8..035d95884 100644
--- a/res/layout-port/hotseat.xml
+++ b/res/layout-port/hotseat.xml
@@ -16,6 +16,7 @@
<com.android.launcher2.Hotseat
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ android:background="@drawable/hotseat_bg_panel"
launcher:cellCountX="5"
launcher:cellCountY="1">
<com.android.launcher2.CellLayout
diff --git a/res/layout/wallpaper_chooser.xml b/res/layout/wallpaper_chooser.xml
index c0a5fdf9e..60d971907 100644
--- a/res/layout/wallpaper_chooser.xml
+++ b/res/layout/wallpaper_chooser.xml
@@ -31,7 +31,8 @@
<Gallery android:id="@+id/gallery"
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content"
+ android:spacing="0dp" />
<Button android:id="@+id/set"
android:layout_width="wrap_content"
diff --git a/res/layout/wallpaper_item.xml b/res/layout/wallpaper_item.xml
index cfd79e252..0834ce680 100644
--- a/res/layout/wallpaper_item.xml
+++ b/res/layout/wallpaper_item.xml
@@ -16,7 +16,6 @@
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/wallpaper_image"
- android:background="?android:attr/galleryItemBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitXY"