diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2016-02-18 11:56:37 -0800 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2016-02-18 12:27:05 -0800 |
| commit | c079202dd4426077e27cbad2ec116d4fd01e1164 (patch) | |
| tree | 60c3b4b71233aa815279404a071930e4c37e0317 /packages/SystemUI | |
| parent | 7676d07cdc4a2d7c641a03062f29e3583fd1bc84 (diff) | |
| download | frameworks_base-c079202dd4426077e27cbad2ec116d4fd01e1164.zip frameworks_base-c079202dd4426077e27cbad2ec116d4fd01e1164.tar.gz frameworks_base-c079202dd4426077e27cbad2ec116d4fd01e1164.tar.bz2 | |
SystemUI: Make sure to dismiss after disabling ext kg focus.
Also verify that a third party keyguard component is even
set.
Change-Id: I9b8193c013067b76d16c035e11eb40f3cf8f46a7
TICKET: CYNGNOS-2084
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 8ad3aef..19f2b09 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -564,7 +564,10 @@ public class StatusBarKeyguardViewManager { public void animateCollapsePanels(float speedUpFactor) { mPhoneStatusBar.animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */, false /* delayed */, speedUpFactor); - dismiss(false); + if (mStatusBarWindowManager.keyguardExternalViewHasFocus()) { + mStatusBarWindowManager.setKeyguardExternalViewFocus(false); + dismiss(false); + } } /** |