Merge "Updated hotseat artwork." into froyo

commit: de38c8e42d0f0ab08c9a5bcc4507832e9d55c5a8 [log] [tgz]
author: Daniel Sandler <dsandler@android.com> Wed Apr 28 13:41:58 2010 -0700
committer: Android (Google) Code Review <android-gerrit@google.com> Wed Apr 28 13:41:58 2010 -0700
tree: 1f591d9d59dcf1e129cfddfb6a81782bb30224d9
parent: 0554b74917e847088e031aa1a9a34463fc3d1ebf [diff]
parent: 786ae544e445ddbb3644a3c87ca81a748ed0e318 [diff]
diff --git a/res/drawable-hdpi/hotseat_bg_center.9.png b/res/drawable-hdpi/hotseat_bg_center.9.png
index 0567b77..468e766 100644
--- a/res/drawable-hdpi/hotseat_bg_center.9.png
+++ b/res/drawable-hdpi/hotseat_bg_center.9.png
Binary files differ

diff --git a/res/drawable-hdpi/hotseat_bg_left.9.png b/res/drawable-hdpi/hotseat_bg_left.9.png
index aaf42c4..433a10e 100644
--- a/res/drawable-hdpi/hotseat_bg_left.9.png
+++ b/res/drawable-hdpi/hotseat_bg_left.9.png
Binary files differ

diff --git a/res/drawable-hdpi/hotseat_bg_right.9.png b/res/drawable-hdpi/hotseat_bg_right.9.png
index 2b8149b..4ea2a73 100644
--- a/res/drawable-hdpi/hotseat_bg_right.9.png
+++ b/res/drawable-hdpi/hotseat_bg_right.9.png
Binary files differ

diff --git a/res/drawable-hdpi/hotseat_browser_focused.png b/res/drawable-hdpi/hotseat_browser_focused.png
index 6044238..6717ad2 100644
--- a/res/drawable-hdpi/hotseat_browser_focused.png
+++ b/res/drawable-hdpi/hotseat_browser_focused.png
Binary files differ

diff --git a/res/drawable-hdpi/hotseat_browser_normal.png b/res/drawable-hdpi/hotseat_browser_normal.png
index e6eb94e..d02fdd9 100644
--- a/res/drawable-hdpi/hotseat_browser_normal.png
+++ b/res/drawable-hdpi/hotseat_browser_normal.png
Binary files differ

diff --git a/res/drawable-hdpi/hotseat_browser_pressed.png b/res/drawable-hdpi/hotseat_browser_pressed.png
index 918afb4..71df2d1 100644
--- a/res/drawable-hdpi/hotseat_browser_pressed.png
+++ b/res/drawable-hdpi/hotseat_browser_pressed.png
Binary files differ

diff --git a/res/drawable-land-hdpi/hotseat_bg_center.9.png b/res/drawable-land-hdpi/hotseat_bg_center.9.png
index f6a59fa..958b4a4 100644
--- a/res/drawable-land-hdpi/hotseat_bg_center.9.png
+++ b/res/drawable-land-hdpi/hotseat_bg_center.9.png
Binary files differ

diff --git a/res/drawable-land-hdpi/hotseat_bg_left.9.png b/res/drawable-land-hdpi/hotseat_bg_left.9.png
index 8320e73..9ea8f9d 100644
--- a/res/drawable-land-hdpi/hotseat_bg_left.9.png
+++ b/res/drawable-land-hdpi/hotseat_bg_left.9.png
Binary files differ

diff --git a/res/drawable-land-hdpi/hotseat_bg_right.9.png b/res/drawable-land-hdpi/hotseat_bg_right.9.png
index 2d74f2bb..ce8f1e2 100644
--- a/res/drawable-land-hdpi/hotseat_bg_right.9.png
+++ b/res/drawable-land-hdpi/hotseat_bg_right.9.png
Binary files differ

diff --git a/res/drawable-land-mdpi/hotseat_bg_center.9.png b/res/drawable-land-mdpi/hotseat_bg_center.9.png
new file mode 100644
index 0000000..691ab01
--- /dev/null
+++ b/res/drawable-land-mdpi/hotseat_bg_center.9.png
Binary files differ

diff --git a/res/drawable-land-mdpi/hotseat_bg_left.9.png b/res/drawable-land-mdpi/hotseat_bg_left.9.png
new file mode 100644
index 0000000..bd235f3
--- /dev/null
+++ b/res/drawable-land-mdpi/hotseat_bg_left.9.png
Binary files differ

diff --git a/res/drawable-land-mdpi/hotseat_bg_right.9.png b/res/drawable-land-mdpi/hotseat_bg_right.9.png
new file mode 100644
index 0000000..6d87f0d
--- /dev/null
+++ b/res/drawable-land-mdpi/hotseat_bg_right.9.png
Binary files differ

diff --git a/res/drawable-mdpi/home_button_focused.png b/res/drawable-mdpi/home_button_focused.png
index 29fcbd0..701772b 100644
--- a/res/drawable-mdpi/home_button_focused.png
+++ b/res/drawable-mdpi/home_button_focused.png
Binary files differ

diff --git a/res/drawable-mdpi/home_button_normal.png b/res/drawable-mdpi/home_button_normal.png
index 58ff958..cc7e3b0 100644
--- a/res/drawable-mdpi/home_button_normal.png
+++ b/res/drawable-mdpi/home_button_normal.png
Binary files differ

diff --git a/res/drawable-mdpi/home_button_pressed.png b/res/drawable-mdpi/home_button_pressed.png
index 32337d6..ee8ddbe 100644
--- a/res/drawable-mdpi/home_button_pressed.png
+++ b/res/drawable-mdpi/home_button_pressed.png
Binary files differ

diff --git a/res/drawable-mdpi/hotseat_bg_center.9.png b/res/drawable-mdpi/hotseat_bg_center.9.png
index a551652..28c3402 100644
--- a/res/drawable-mdpi/hotseat_bg_center.9.png
+++ b/res/drawable-mdpi/hotseat_bg_center.9.png
Binary files differ

diff --git a/res/drawable-mdpi/hotseat_bg_left.9.png b/res/drawable-mdpi/hotseat_bg_left.9.png
old mode 100755
new mode 100644
index cd46c6c..605eb1e
--- a/res/drawable-mdpi/hotseat_bg_left.9.png
+++ b/res/drawable-mdpi/hotseat_bg_left.9.png
Binary files differ

diff --git a/res/drawable-mdpi/hotseat_bg_right.9.png b/res/drawable-mdpi/hotseat_bg_right.9.png
index dba0961..5df3f00 100644
--- a/res/drawable-mdpi/hotseat_bg_right.9.png
+++ b/res/drawable-mdpi/hotseat_bg_right.9.png
Binary files differ

diff --git a/res/drawable-mdpi/hotseat_browser_focused.png b/res/drawable-mdpi/hotseat_browser_focused.png
index de8defc..5b85840 100644
--- a/res/drawable-mdpi/hotseat_browser_focused.png
+++ b/res/drawable-mdpi/hotseat_browser_focused.png
Binary files differ

diff --git a/res/drawable-mdpi/hotseat_browser_normal.png b/res/drawable-mdpi/hotseat_browser_normal.png
index 35205a2..4c662fd 100644
--- a/res/drawable-mdpi/hotseat_browser_normal.png
+++ b/res/drawable-mdpi/hotseat_browser_normal.png
Binary files differ

diff --git a/res/drawable-mdpi/hotseat_browser_pressed.png b/res/drawable-mdpi/hotseat_browser_pressed.png
index d0a072e..ed10c18 100644
--- a/res/drawable-mdpi/hotseat_browser_pressed.png
+++ b/res/drawable-mdpi/hotseat_browser_pressed.png
Binary files differ

diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 22b4825..96db6df 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml

@@ -94,13 +94,13 @@
         android:layout_width="@dimen/button_bar_height_portrait"
         android:layout_gravity="right|center_vertical"
         android:layout_marginBottom="@dimen/half_status_bar_height"
-        android:padding="4dip"
         >
 
         <com.android.launcher2.HandleView
             style="@style/HotseatButton"
             android:id="@+id/all_apps_button"
-            android:layout_centerInParent="true"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
 
             android:src="@drawable/all_apps_button"
             launcher:direction="vertical"

diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 3b181d1..c1a7440 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml

@@ -86,13 +86,14 @@
         android:layout_width="fill_parent"
         android:layout_height="@dimen/button_bar_height"
         android:layout_gravity="bottom|center_horizontal"
-        android:padding="4dip"
+        android:paddingTop="2dip"
         >
 
         <com.android.launcher2.HandleView
             style="@style/HotseatButton"
             android:id="@+id/all_apps_button"
-            android:layout_centerInParent="true"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentBottom="true"
 
             android:src="@drawable/all_apps_button"
             launcher:direction="horizontal"
commit	de38c8e42d0f0ab08c9a5bcc4507832e9d55c5a8	[log] [tgz]
author	Daniel Sandler <dsandler@android.com>	Wed Apr 28 13:41:58 2010 -0700
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed Apr 28 13:41:58 2010 -0700
tree	1f591d9d59dcf1e129cfddfb6a81782bb30224d9
parent	0554b74917e847088e031aa1a9a34463fc3d1ebf [diff]
parent	786ae544e445ddbb3644a3c87ca81a748ed0e318 [diff]