Merge "New richly-appointed navigation buttons."

45 files changed, 156 insertions, 111 deletions

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png
index 7f96b03..ac5a97b 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_default.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_default.png
deleted file mode 100644
index ac5a97b..0000000
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_default.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_default_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png
index c345e84..c345e84 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_default_land.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_pressed.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_pressed.png
deleted file mode 100644
index 8436f5a..0000000
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_pressed.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png
index c43a019..a90dc9b 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_default.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_default.png
deleted file mode 100644
index a90dc9b..0000000
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_default.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_default_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png
index d686787..d686787 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_default_land.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_pressed.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_pressed.png
deleted file mode 100644
index 83068a9..0000000
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_pressed.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png
index 7af5454..d23f9b7 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_default.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_default.png
deleted file mode 100644
index d23f9b7..0000000
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_default.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_default_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png
index 6d99ba5..6d99ba5 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_default_land.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_pressed.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_pressed.png
deleted file mode 100644
index 56a4a1d..0000000
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_pressed.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png
index 2d80bb9..cb3c433 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_default.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_default.png
deleted file mode 100644
index cb3c433..0000000
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_default.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_default_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png
index 11ddf00..11ddf00 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_default_land.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_pressed.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_pressed.png
deleted file mode 100644
index afc4057..0000000
--- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_pressed.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png
index 5ab09f0..5ab09f0 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_default.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_default_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png
index d63b42a..d63b42a 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_default_land.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_pressed.png
deleted file mode 100644
index 83a8b26..0000000
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_pressed.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png
index 62ca427..62ca427 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_default.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_default_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png
index 74d2590..74d2590 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_default_land.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_pressed.png
deleted file mode 100644
index b090b95..0000000
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_pressed.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png
index 6d4d55d..6d4d55d 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_default.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_default_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png
index 6619393..6619393 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_default_land.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_pressed.png
deleted file mode 100644
index 1affd8f..0000000
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_pressed.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_default.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png
index ff698fb..ff698fb 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_default.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_default_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png
index 6cc8031..6cc8031 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_default_land.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_pressed.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_pressed.png
deleted file mode 100644
index c9724fc..0000000
--- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_pressed.png
+++ /dev/null
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_default.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png
index 4cb305d..4cb305d 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_default.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_default_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png
index 85df060..85df060 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_default_land.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_default.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png
index 31d35c8..31d35c8 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_default.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_default_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png
index 334213b..334213b 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_default_land.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_default.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png
index 7c21c48..7c21c48 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_default.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_default_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png
index 1fe6b91..1fe6b91 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_default_land.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_default.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png
index f0cc341..f0cc341 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_default.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_default_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png
index 7e8504c..7e8504c 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_default_land.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png
diff --git a/packages/SystemUI/res/drawable/ic_sysbar_back.xml b/packages/SystemUI/res/drawable/ic_sysbar_back.xml
deleted file mode 100644
index 327ccd8..0000000
--- a/packages/SystemUI/res/drawable/ic_sysbar_back.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_back_pressed" />
-    <item android:drawable="@drawable/ic_sysbar_back_default" />
-</selector>
-
diff --git a/packages/SystemUI/res/drawable/ic_sysbar_home.xml b/packages/SystemUI/res/drawable/ic_sysbar_home.xml
deleted file mode 100644
index f4e585e..0000000
--- a/packages/SystemUI/res/drawable/ic_sysbar_home.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_home_pressed" />
-    <item android:drawable="@drawable/ic_sysbar_home_default" />
-</selector>
-
diff --git a/packages/SystemUI/res/drawable/ic_sysbar_menu.xml b/packages/SystemUI/res/drawable/ic_sysbar_menu.xml
deleted file mode 100644
index 7a10607..0000000
--- a/packages/SystemUI/res/drawable/ic_sysbar_menu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_menu_pressed" />
-    <item android:drawable="@drawable/ic_sysbar_menu_default" />
-</selector>
-
diff --git a/packages/SystemUI/res/drawable/ic_sysbar_recent.xml b/packages/SystemUI/res/drawable/ic_sysbar_recent.xml
deleted file mode 100755
index 39a324b..0000000
--- a/packages/SystemUI/res/drawable/ic_sysbar_recent.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_sysbar_recent_pressed" />
-    <item android:drawable="@drawable/ic_sysbar_recent_default" />
-</selector>
-
diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar.xml b/packages/SystemUI/res/layout-sw600dp/status_bar.xml
index a2a6473..a204f17 100644
--- a/packages/SystemUI/res/layout-sw600dp/status_bar.xml
+++ b/packages/SystemUI/res/layout-sw600dp/status_bar.xml
@@ -32,6 +32,7 @@
             android:id="@+id/bar_contents"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:clipChildren="false"
             >
 
             <!-- notification icons & panel access -->
@@ -50,6 +51,7 @@
                 android:layout_alignParentLeft="true"
                 systemui:keyCode="4"
                 android:contentDescription="@string/accessibility_back"
+                systemui:glowBackground="@drawable/ic_sysbar_highlight"
                 />
             <LinearLayout
                 android:id="@+id/navigationArea"
@@ -57,6 +59,8 @@
                 android:layout_height="match_parent"
                 android:layout_toRightOf="@+id/back"
                 android:orientation="horizontal"
+                android:clipChildren="false"
+                android:clipToPadding="false"
                 >
                 <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
                     android:layout_width="80dip"
@@ -64,12 +68,14 @@
                     android:src="@drawable/ic_sysbar_home"
                     systemui:keyCode="3"
                     android:contentDescription="@string/accessibility_home"
+                    systemui:glowBackground="@drawable/ic_sysbar_highlight"
                     />
-                <ImageView android:id="@+id/recent_apps"
+                <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"
                     android:layout_width="80dip"
                     android:layout_height="match_parent"
                     android:src="@drawable/ic_sysbar_recent"
                     android:contentDescription="@string/accessibility_menu"
+                    systemui:glowBackground="@drawable/ic_sysbar_highlight"
                     />
                 <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu"
                     android:layout_width="80dip"
@@ -78,6 +84,7 @@
                     systemui:keyCode="82"
                     android:visibility="invisible"
                     android:contentDescription="@string/accessibility_menu"
+                    systemui:glowBackground="@drawable/ic_sysbar_highlight"
                     />
             </LinearLayout>
 
diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml
index 5d7e8de..37d390a 100644
--- a/packages/SystemUI/res/layout/navigation_bar.xml
+++ b/packages/SystemUI/res/layout/navigation_bar.xml
@@ -46,7 +46,7 @@
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
                 android:layout_width="80dp"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_sysbar_back_default"
+                android:src="@drawable/ic_sysbar_back"
                 systemui:keyCode="4"
                 android:layout_weight="0"
                 />
@@ -59,7 +59,7 @@
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
                 android:layout_width="80dp"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_sysbar_home_default"
+                android:src="@drawable/ic_sysbar_home"
                 systemui:keyCode="3"
                 android:layout_weight="0"
                 />
@@ -69,16 +69,16 @@
                 android:layout_weight="1"
                 android:contentDescription="@string/accessibility_home"
                 />
-            <ImageView android:id="@+id/recent_apps"
+            <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"
                 android:layout_width="80dp"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_sysbar_recent_default"
+                android:src="@drawable/ic_sysbar_recent"
                 android:layout_weight="0"
                 />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu"
                 android:layout_width="40dp"
                 android:layout_height="match_parent"
-                android:src="@drawable/ic_sysbar_menu_default"
+                android:src="@drawable/ic_sysbar_menu"
                 systemui:keyCode="82"
                 android:layout_weight="0"
                 android:visibility="invisible"
@@ -112,7 +112,7 @@
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu"
                 android:layout_height="40dp"
                 android:layout_width="match_parent"
-                android:src="@drawable/ic_sysbar_menu_default_land"
+                android:src="@drawable/ic_sysbar_menu_land"
                 systemui:keyCode="82"
                 android:layout_weight="0"
                 android:visibility="invisible"
@@ -120,7 +120,7 @@
             <ImageView android:id="@+id/recent_apps"
                 android:layout_height="80dp"
                 android:layout_width="match_parent"
-                android:src="@drawable/ic_sysbar_recent_default_land"
+                android:src="@drawable/ic_sysbar_recent_land"
                 android:layout_weight="0"
                 />
             <View 
@@ -132,7 +132,7 @@
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
                 android:layout_height="80dp"
                 android:layout_width="match_parent"
-                android:src="@drawable/ic_sysbar_home_default_land"
+                android:src="@drawable/ic_sysbar_home_land"
                 systemui:keyCode="3"
                 android:layout_weight="0"
                 android:contentDescription="@string/accessibility_home"
@@ -146,7 +146,7 @@
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
                 android:layout_height="80dp"
                 android:layout_width="match_parent"
-                android:src="@drawable/ic_sysbar_back_default_land"
+                android:src="@drawable/ic_sysbar_back_land"
                 systemui:keyCode="4"
                 android:layout_weight="0"
                 />
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml
index 5291629..b2b6d50 100644
--- a/packages/SystemUI/res/values/attrs.xml
+++ b/packages/SystemUI/res/values/attrs.xml
@@ -17,6 +17,7 @@
 <resources>
     <declare-styleable name="KeyButtonView">
         <attr name="keyCode" format="integer" />
+        <attr name="glowBackground" format="reference" />
     </declare-styleable>
     <declare-styleable name="ToggleSlider">
         <attr name="text" format="string" />
diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
index eaffd1a..6ecfd94 100644
--- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
@@ -131,9 +131,16 @@ public class SwipeHelper {
         return result;
     }
 
-    void invalidateGlobalRegion(View view) {
-        RectF childBounds = new RectF(view.getLeft(), view.getTop(), view.getRight(), view
-                .getBottom());
+    // invalidate the view's own bounds all the way up the view hierarchy
+    public static void invalidateGlobalRegion(View view) {
+        invalidateGlobalRegion(
+            view,
+            new RectF(view.getLeft(), view.getTop(), view.getRight(), view.getBottom()));
+    }
+
+    // invalidate a rectangle relative to the view's coordinate system all the way up the view
+    // hierarchy
+    public static void invalidateGlobalRegion(View view, RectF childBounds) {
         childBounds.offset(view.getX(), view.getY());
         if (DEBUG_INVALIDATE)
             Log.v(TAG, "-------------");
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
index c82220d..87fbbb7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
@@ -16,10 +16,15 @@
 
 package com.android.systemui.statusbar.policy;
 
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.Canvas;
+import android.graphics.RectF;
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.ServiceManager;
@@ -33,7 +38,9 @@ import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.SoundEffectConstants;
+import android.view.View;
 import android.view.ViewConfiguration;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RemoteViews.RemoteView;
 
@@ -48,18 +55,25 @@ public class KeyButtonView extends ImageView {
     int mCode;
     int mRepeat;
     int mTouchSlop;
+    Drawable mGlowBG;
+    float mGlowAlpha = 0f, mGlowScale = 1f, mDrawingAlpha = 1f;
 
     Runnable mCheckLongPress = new Runnable() {
         public void run() {
             if (isPressed()) {
-                mRepeat++;
-                sendEvent(KeyEvent.ACTION_DOWN,
-                        KeyEvent.FLAG_FROM_SYSTEM
-                        | KeyEvent.FLAG_VIRTUAL_HARD_KEY
-                        | KeyEvent.FLAG_LONG_PRESS);
 
-                sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
-                //playSoundEffect(SoundEffectConstants.CLICK);
+                if (mCode != 0) {
+                    mRepeat++;
+                    sendEvent(KeyEvent.ACTION_DOWN,
+                            KeyEvent.FLAG_FROM_SYSTEM
+                            | KeyEvent.FLAG_VIRTUAL_HARD_KEY
+                            | KeyEvent.FLAG_LONG_PRESS);
+
+                    sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
+                } else {
+                    // Just an old-fashioned ImageView
+                    performLongClick();
+                }
             }
         }
     };
@@ -75,8 +89,10 @@ public class KeyButtonView extends ImageView {
                 defStyle, 0);
 
         mCode = a.getInteger(R.styleable.KeyButtonView_keyCode, 0);
-        if (mCode == 0) {
-            Slog.w(TAG, "KeyButtonView without key code id=0x" + Integer.toHexString(getId()));
+
+        mGlowBG = a.getDrawable(R.styleable.KeyButtonView_glowBackground);
+        if (mGlowBG != null) {
+            mDrawingAlpha = 0.5f;
         }
         
         a.recycle();
@@ -88,6 +104,98 @@ public class KeyButtonView extends ImageView {
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
     }
 
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (mGlowBG != null) {
+            canvas.save();
+            final int w = getWidth();
+            final int h = getHeight();
+            canvas.scale(mGlowScale, mGlowScale, w*0.5f, h*0.5f);
+            mGlowBG.setBounds(0, 0, w, h);
+            mGlowBG.setAlpha((int)(mGlowAlpha * 255));
+            mGlowBG.draw(canvas);
+            canvas.restore();
+
+            canvas.saveLayerAlpha(null, (int)(mDrawingAlpha * 255), Canvas.ALL_SAVE_FLAG);
+        }
+        super.onDraw(canvas);
+        if (mGlowBG != null) {
+            canvas.restore();
+        }
+    }
+
+    public float getDrawingAlpha() {
+        if (mGlowBG == null) return 0;
+        return mDrawingAlpha;
+    }
+
+    public void setDrawingAlpha(float x) {
+        if (mGlowBG == null) return;
+        mDrawingAlpha = x;
+        invalidate();
+    }
+
+    public float getGlowAlpha() {
+        if (mGlowBG == null) return 0;
+        return mGlowAlpha;
+    }
+
+    public void setGlowAlpha(float x) {
+        if (mGlowBG == null) return;
+        mGlowAlpha = x;
+        invalidate();
+    }
+
+    public float getGlowScale() {
+        if (mGlowBG == null) return 0;
+        return mGlowScale;
+    }
+
+    public void setGlowScale(float x) {
+        if (mGlowBG == null) return;
+        mGlowScale = x;
+        final float w = getWidth();
+        final float h = getHeight();
+        if (x < 1.0f) {
+            invalidate();
+        } else {
+            x = (w * (x - 1.0f)) / 2.0f;
+            com.android.systemui.SwipeHelper.invalidateGlobalRegion(
+                    this,
+                    new RectF(getLeft() - x,
+                              getTop() - x,
+                              getRight() + x,
+                              getBottom() + x));
+        }
+    }
+
+    public void setPressed(boolean pressed) {
+        if (mGlowBG != null) {
+            if (pressed != isPressed()) {
+                AnimatorSet as = new AnimatorSet();
+                if (pressed) {
+                    if (mGlowScale < 1.7f) mGlowScale = 1.7f;
+                    if (mGlowAlpha < 0.5f) mGlowAlpha = 0.5f;
+                    setDrawingAlpha(1f);
+                    as.playTogether(
+                        ObjectAnimator.ofFloat(this, "glowAlpha", 1f),
+                        ObjectAnimator.ofFloat(this, "glowScale", 1.8f)
+                    );
+                    as.setDuration(50);
+                } else {
+                    as.playTogether(
+                        ObjectAnimator.ofFloat(this, "glowAlpha", 0f),
+                        ObjectAnimator.ofFloat(this, "glowScale", 1f),
+                        ObjectAnimator.ofFloat(this, "drawingAlpha", 0.5f)
+                    );
+                    as.setDuration(500);
+                }
+                as.start();
+            }
+        }
+        super.setPressed(pressed);
+    }
+
     public boolean onTouchEvent(MotionEvent ev) {
         final int action = ev.getAction();
         int x, y;
@@ -131,12 +239,18 @@ public class KeyButtonView extends ImageView {
                     mSending = false;
                     final int flags = KeyEvent.FLAG_FROM_SYSTEM | KeyEvent.FLAG_VIRTUAL_HARD_KEY;
                     removeCallbacks(mCheckLongPress);
-                    if (doIt) {
-                        sendEvent(KeyEvent.ACTION_UP, flags);
-                        sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
-                        playSoundEffect(SoundEffectConstants.CLICK);
+
+                    if (mCode != 0) {
+                        if (doIt) {
+                            sendEvent(KeyEvent.ACTION_UP, flags);
+                            sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+                            playSoundEffect(SoundEffectConstants.CLICK);
+                        } else {
+                            sendEvent(KeyEvent.ACTION_UP, flags | KeyEvent.FLAG_CANCELED);
+                        }
                     } else {
-                        sendEvent(KeyEvent.ACTION_UP, flags | KeyEvent.FLAG_CANCELED);
+                        // no key code, just a regular ImageView
+                        if (doIt) performClick();
                     }
                 }
                 break;