From 226797c8e2aba40ecbfb646f2ef5085893dff46a Mon Sep 17 00:00:00 2001 From: Danesh M Date: Thu, 16 Jun 2016 20:17:58 -0700 Subject: 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 --- services/core/java/com/android/server/wm/WindowAnimator.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'services/core') 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 -- cgit v1.1