commit 6539a83f776ed66851f3712bc7e300418ee4aee5
author Jorim Jaggi <jjaggi@google.com> Tue Jun 03 23:33:09 2014 +0200
committer Jorim Jaggi <jjaggi@google.com> Tue Jun 03 23:33:09 2014 +0200
tree a293fd91169fa2bd394d2372523216e5e76a8cca
parent e42c72e1b27888035e0ee4455c0c90d63abe3c75

Go back to keyguard when in SHADE_LOCKED with single tap.

Bug: 15188946
Change-Id: Iee9f1572bd25a5fc9f1ad7e182746a6f09a49f6d

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index f43f348..142517c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -637,10 +637,12 @@
         if (mHintAnimationRunning) {
             return true;
         }
-        if (x < mEdgeTapAreaWidth) {
+        if (x < mEdgeTapAreaWidth
+                && mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
             onEdgeClicked(false /* right */);
             return true;
-        } else if (x > getWidth() - mEdgeTapAreaWidth) {
+        } else if (x > getWidth() - mEdgeTapAreaWidth
+                && mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
             onEdgeClicked(true /* right */);
             return true;
         } else {
@@ -654,7 +656,7 @@
                 startUnlockHintAnimation();
                 return true;
             case StatusBarState.SHADE_LOCKED:
-                // TODO: Go to Keyguard again.
+                mStatusBar.goToKeyguard();
                 return true;
             case StatusBarState.SHADE:
                 collapse();