Lockscreen : Bunch-o-fixes

- Prevent edge gesture from conflicting with lockscreen shortcuts
- Fix lockscreen shortcuts crash where animations were being run
  on detached view
- Fix statusbar flicker when swiping keyguard in from the left
- Fade scrim away when swiping lockscreen in and out
- Fix back button not working when showing bouncer in
  external keyguard.
- Ensure we collapse bottom area after up/cancel when
  in external keyguard
- Fix issue where clock/notifications can get off-center
  when swiping to left.
- Fix bottom flicker when swiping lockscreen to left
- Only lock directional swiping when swipe helper acknowledges it.
  This allows for all the standard swipe behavior to function.
- Ensure lockscreen shortcuts are not actionable when in SHADE
- Only dismiss bottom area after lockscreen shortcuts animations
  have finished animating
- Prevent swipe when album art showing

CYNGNOS-2585
CYNGNOS-2488
CYNGNOS-2517
CYNGNOS-2390
CYNGNOS-2632
CYNGNOS-2634

Change-Id: I2fe767ed7e07b621075c755aae98121c8517b997

1 files changed, 7 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index cb150dc..943bea9 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -1764,10 +1764,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                                 mNavigationBarLeftInLandscape) {
                             requestTransientBars(mNavigationBar);
                         }
-                        if (mShowKeyguardOnLeftSwipe && isKeyguardShowingOrOccluded()) {
+                        boolean focusedWindowIsExternalKeyguard = false;
+                        if (mFocusedWindow != null) {
+                            focusedWindowIsExternalKeyguard = (mFocusedWindow.getAttrs().type
+                                    & WindowManager.LayoutParams.TYPE_KEYGUARD_PANEL) != 0;
+                        }
+                        if (mShowKeyguardOnLeftSwipe && isKeyguardShowingOrOccluded()
+                                && focusedWindowIsExternalKeyguard) {
                             // Show keyguard
                             mKeyguardDelegate.showKeyguard();
-                            mShowKeyguardOnLeftSwipe = false;
                         }
                     }
                     @Override