diff options
| author | Danesh M <daneshm90@gmail.com> | 2016-06-17 15:22:59 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-06-29 11:27:48 -0700 |
| commit | ef8760f7b2a298f8c21a8ac11d76c65aa0b89bbb (patch) | |
| tree | 896ea1423a109a812c04645db7a627aa025a5dd6 /packages | |
| parent | c76766953ebabd327f5ddc8410bfcdbc09e77b25 (diff) | |
| download | frameworks_base-ef8760f7b2a298f8c21a8ac11d76c65aa0b89bbb.zip frameworks_base-ef8760f7b2a298f8c21a8ac11d76c65aa0b89bbb.tar.gz frameworks_base-ef8760f7b2a298f8c21a8ac11d76c65aa0b89bbb.tar.bz2 | |
Revert "Revert "Only show keyguard panel if on lockscreen + no activity on top""
CYNGNOS-2980
This reverts commit 226797c8e2aba40ecbfb646f2ef5085893dff46a.
Change-Id: I0440faf2dd07b427f639277eec2f3cfa89a7de6e
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java | 4 |
2 files changed, 6 insertions, 2 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 e79453e..d435f20 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -4539,6 +4539,10 @@ 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 b292441..ccbe911 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()) { + if (isShowingLiveLockScreenView() && !mBar.isKeyguardInputRestricted()) { mPanelView.removeView(mLiveLockScreenView); - mLlsHasFocus = false; } + mLlsHasFocus = false; } } |