summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java4
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java4
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;
}
}