diff options
| author | Danesh M <daneshm90@gmail.com> | 2016-06-16 20:17:58 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-06-16 20:18:04 -0700 |
| commit | 226797c8e2aba40ecbfb646f2ef5085893dff46a (patch) | |
| tree | bd746580fcc599a9cb339093b7c127f120648770 /services/core | |
| parent | 9153396acb31fe956c3c7200c376ccbaeb6ce170 (diff) | |
| download | frameworks_base-226797c8e2aba40ecbfb646f2ef5085893dff46a.zip frameworks_base-226797c8e2aba40ecbfb646f2ef5085893dff46a.tar.gz frameworks_base-226797c8e2aba40ecbfb646f2ef5085893dff46a.tar.bz2 | |
Revert "Only show keyguard panel if on lockscreen + no activity on top"
Breaks SHOW_WHEN_LOCKED for secure lockscreen + blur + LLS
CYNGNOS-3057
This reverts commit 28e023d0c621f00e357f52264baaedf72c1eeee7.
Change-Id: Iccec0129e793b910af02bf0a8f60ec9a2ca226a2
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowAnimator.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index 3289c2e..1ff209b 100644 --- a/services/core/java/com/android/server/wm/WindowAnimator.java +++ b/services/core/java/com/android/server/wm/WindowAnimator.java @@ -220,9 +220,7 @@ public class WindowAnimator { // Show SHOW_WHEN_LOCKED windows that turn on the screen allowWhenLocked |= (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0 && win.mTurnOnScreen; // Show windows that use TYPE_STATUS_BAR_SUB_PANEL when locked - allowWhenLocked |= win.mAttrs.type == WindowManager.LayoutParams.TYPE_KEYGUARD_PANEL && - winShowWhenLocked == null; - + allowWhenLocked |= win.mAttrs.type == WindowManager.LayoutParams.TYPE_KEYGUARD_PANEL; if (appShowWhenLocked != null) { allowWhenLocked |= appShowWhenLocked == win.mAppToken |