summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-10-24 14:31:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-24 14:31:22 -0700
commit4761b176ed241a88394968b983f06c5ae1aad26a (patch)
treef3d61adbc9247a7d66bcb096830f373e81a06659
parenta8cbdb9a9ccb4cd6409be6caa47f810f1c2b6f4b (diff)
parentbd5dba3571d940e98bf8d7179718448faa37c218 (diff)
downloadframeworks_base-4761b176ed241a88394968b983f06c5ae1aad26a.zip
frameworks_base-4761b176ed241a88394968b983f06c5ae1aad26a.tar.gz
frameworks_base-4761b176ed241a88394968b983f06c5ae1aad26a.tar.bz2
Merge "make the back (previous track) button into a cancel button."
-rw-r--r--packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.pngbin636 -> 0 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/status_bar_back_default.pngbin436 -> 48936 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/status_bar_back_pressed.pngbin436 -> 49157 bytes
-rw-r--r--packages/SystemUI/res/layout-xlarge/status_bar.xml22
4 files changed, 11 insertions, 11 deletions
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png
deleted file mode 100644
index 6c5a79b..0000000
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png
+++ /dev/null
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_back_default.png b/packages/SystemUI/res/drawable-mdpi/status_bar_back_default.png
index 5aed42f..f99a66d 100644
--- a/packages/SystemUI/res/drawable-mdpi/status_bar_back_default.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_back_default.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/status_bar_back_pressed.png b/packages/SystemUI/res/drawable-mdpi/status_bar_back_pressed.png
index 5aed42f..94a0649 100644
--- a/packages/SystemUI/res/drawable-mdpi/status_bar_back_pressed.png
+++ b/packages/SystemUI/res/drawable-mdpi/status_bar_back_pressed.png
Binary files differ
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar.xml b/packages/SystemUI/res/layout-xlarge/status_bar.xml
index cf96e37..429fdf2 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar.xml
@@ -131,17 +131,17 @@
<com.android.systemui.statusbar.KeyButtonView android:id="@+id/back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="4dip"
- android:paddingRight="4dip"
- android:src="@drawable/ic_sysbar_back"
+ android:paddingLeft="15dip"
+ android:paddingRight="15dip"
+ android:src="@drawable/status_bar_back"
android:background="@drawable/ic_sysbar_icon_bg"
systemui:keyCode="4"
/>
<com.android.systemui.statusbar.KeyButtonView android:id="@+id/home"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="4dip"
- android:paddingRight="4dip"
+ android:paddingLeft="15dip"
+ android:paddingRight="15dip"
android:src="@drawable/ic_sysbar_home"
android:background="@drawable/ic_sysbar_icon_bg"
systemui:keyCode="3"
@@ -151,14 +151,14 @@
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_recent"
android:background="@drawable/ic_sysbar_icon_bg"
- android:paddingLeft="4dip"
- android:paddingRight="4dip"
+ android:paddingLeft="15dip"
+ android:paddingRight="15dip"
/>
<com.android.systemui.statusbar.KeyButtonView android:id="@+id/menu"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="4dip"
- android:paddingRight="4dip"
+ android:paddingLeft="15dip"
+ android:paddingRight="15dip"
android:src="@drawable/ic_sysbar_menu"
android:background="@drawable/ic_sysbar_icon_bg"
systemui:keyCode="82"
@@ -169,8 +169,8 @@
android:layout_width="71dip"
android:layout_height="match_parent"
android:background="@drawable/ic_sysbar_icon_bg"
- android:paddingLeft="4dip"
- android:paddingRight="4dip"
+ android:paddingLeft="15dip"
+ android:paddingRight="15dip"
android:animateLayoutChanges="true"
android:clickable="true"
android:descendantFocusability="blocksDescendants"