commit 612f8da2bc994043f26a278a9b1c2b681eabc4c9
author Daniel Sandler <dsandler@google.com> Thu Jul 22 06:19:21 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 22 06:19:21 2010 -0700
tree 10491917e67c6772f054c3d5a0557ba47ca9072c
parent a3ebcc9d2ea15614529e112880e1d16e81a178e1
parent a101f8f6ef1c730f3f008256734cde54417e22cc

Merge "Fix pressed states on system bar buttons."

packages/SystemUI/res/drawable/status_bar_back_pressed.png

diff --git a/packages/SystemUI/res/drawable/status_bar_back_pressed.png b/packages/SystemUI/res/drawable/status_bar_back_pressed.png
index b25fba2..beda981 100644
--- a/packages/SystemUI/res/drawable/status_bar_back_pressed.png
+++ b/packages/SystemUI/res/drawable/status_bar_back_pressed.png
Binary files differ

packages/SystemUI/res/drawable/status_bar_home_pressed.png

diff --git a/packages/SystemUI/res/drawable/status_bar_home_pressed.png b/packages/SystemUI/res/drawable/status_bar_home_pressed.png
index f91e399..c81c1fb 100644
--- a/packages/SystemUI/res/drawable/status_bar_home_pressed.png
+++ b/packages/SystemUI/res/drawable/status_bar_home_pressed.png
Binary files differ

packages/SystemUI/res/drawable/status_bar_menu_pressed.png

diff --git a/packages/SystemUI/res/drawable/status_bar_menu_pressed.png b/packages/SystemUI/res/drawable/status_bar_menu_pressed.png
index 0acd143..33344d0 100644
--- a/packages/SystemUI/res/drawable/status_bar_menu_pressed.png
+++ b/packages/SystemUI/res/drawable/status_bar_menu_pressed.png
Binary files differ

packages/SystemUI/src/com/android/systemui/statusbar/KeyButtonView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyButtonView.java
index ea1af36..4ab91b0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyButtonView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyButtonView.java
@@ -72,6 +72,7 @@
                 mRepeat = 0;
                 mSending = true;
                 sendEvent(KeyEvent.ACTION_DOWN, mDownTime);
+                setPressed(true);
                 break;
             case MotionEvent.ACTION_MOVE:
                 if (mSending) {
@@ -80,14 +81,16 @@
                     if (x < 0 || x >= getWidth() || y < 0 || y >= getHeight()) {
                         mSending = false;
                         sendEvent(KeyEvent.ACTION_UP);
+                        setPressed(false);
                     }
                 }
                 break;
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
                 if (mSending) {
-                    sendEvent(KeyEvent.ACTION_UP);
                     mSending = false;
+                    sendEvent(KeyEvent.ACTION_UP);
+                    setPressed(false);
                 }
                 break;
         }