diff options
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 9 |
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 |