SystemUI : Fix left swipe when dismissing bouncer

- Only show bouncer when requesting dismiss, which will set the states
for us.
- Also remove duplicate states.
- Ensure we disable edge gesture when showKeyguard is called
- Bail out on showKeyguard if already in keyguard.

CYNGNOS-2872

Change-Id: I6be10923de1590b386c270925654669a8f832cfe

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 3c9f47f..166b25c 100755
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -62,6 +62,7 @@ import android.view.animation.AnimationUtils;
 
 import com.android.systemui.cm.UserContentObserver;
 import com.android.systemui.qs.tiles.LockscreenToggleTile;
+import com.android.systemui.statusbar.StatusBarState;
 import cyanogenmod.app.Profile;
 import cyanogenmod.app.ProfileManager;
 
@@ -1297,7 +1298,8 @@ public class KeyguardViewMediator extends SystemUI {
     public void showKeyguard() {
         // This is to prevent left edge from interfering
         // with affordances.
-        if (mStatusBar.isAffordanceSwipeInProgress()) {
+        if (mStatusBar.isAffordanceSwipeInProgress()
+                || mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
             return;
         }