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

2 files changed, 2 insertions, 6 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 39ef494..8234dcd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -4538,10 +4538,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         return mStatusBarKeyguardViewManager != null && mStatusBarKeyguardViewManager.isSecure();
     }
 
-    public boolean isKeyguardInputRestricted() {
-        return mStatusBarKeyguardViewManager != null && mStatusBarKeyguardViewManager.isInputRestricted();
-    }
-
     public long calculateGoingToFullShadeDelay() {
         return mKeyguardFadingAwayDelay + mKeyguardFadingAwayDuration;
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java
index ccbe911..b292441 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java
@@ -102,10 +102,10 @@ public class LiveLockScreenController {
                 }
             }
         } else {
-            if (isShowingLiveLockScreenView() && !mBar.isKeyguardInputRestricted()) {
+            if (isShowingLiveLockScreenView()) {
                 mPanelView.removeView(mLiveLockScreenView);
+                mLlsHasFocus = false;
             }
-            mLlsHasFocus = false;
         }
     }