diff options
| author | Ethan Chen <intervigil@gmail.com> | 2016-04-20 19:00:20 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-06-01 15:16:50 -0700 |
| commit | cb4391b421d2d461eef7ac10e83cdbc406d4cf9b (patch) | |
| tree | c6dbfc1192382811f99bb353a35fcd85ef81138c /packages | |
| parent | 1fb2216d2db20bfa2ae437168ab9734ddc265486 (diff) | |
| download | frameworks_base-cb4391b421d2d461eef7ac10e83cdbc406d4cf9b.zip frameworks_base-cb4391b421d2d461eef7ac10e83cdbc406d4cf9b.tar.gz frameworks_base-cb4391b421d2d461eef7ac10e83cdbc406d4cf9b.tar.bz2 | |
SystemUI: Fix mCanDismissKeyguard state issue
* Setting it to keyguardShowing causes issues when notifications are
expanded from the lockscreen if a fingerprint is used to unlock the
device.
REF: CYNGNOS-2400, NIGHTLIES-2767
Change-Id: Id973c2cc011e56f516a34b69df0851ee3307af24
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 390fb1e..7f16f31 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -1334,7 +1334,9 @@ public class NotificationPanelView extends PanelView implements mStatusBarState = statusBarState; mKeyguardShowing = keyguardShowing; - mCanDismissKeyguard = keyguardShowing; + if (oldState != statusBarState && statusBarState == StatusBarState.KEYGUARD) { + mCanDismissKeyguard = true; + } if (goingToFullShade || (oldState == StatusBarState.KEYGUARD && statusBarState == StatusBarState.SHADE_LOCKED)) { |