diff options
| -rw-r--r-- | packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java b/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java index 06d14449aa0d..aee7643b69f7 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java @@ -171,6 +171,7 @@ public class CarKeyguardViewController extends OverlayViewController implements mKeyguardStateController.notifyKeyguardState(mShowing, /* occluded= */ false); mCarNavigationBarController.showAllKeyguardButtons(/* isSetUp= */ true); start(); + getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ true); reset(/* hideBouncerWhenShowing= */ false); notifyKeyguardUpdateMonitor(); } @@ -185,6 +186,7 @@ public class CarKeyguardViewController extends OverlayViewController implements mBouncer.hide(/* destroyView= */ true); mCarNavigationBarController.hideAllKeyguardButtons(/* isSetUp= */ true); stop(); + getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ false); mKeyguardStateController.notifyKeyguardDoneFading(); mViewMediatorCallback.keyguardGone(); notifyKeyguardUpdateMonitor(); @@ -229,7 +231,9 @@ public class CarKeyguardViewController extends OverlayViewController implements @Override public void dismissAndCollapse() { - hide(/* startTime= */ 0, /* fadeoutDuration= */ 0); + if (!mBouncer.isSecure()) { + hide(/* startTime= */ 0, /* fadeoutDuration= */ 0); + } } @Override @@ -241,7 +245,6 @@ public class CarKeyguardViewController extends OverlayViewController implements @Override public void setNeedsInput(boolean needsInput) { - getOverlayViewGlobalStateController().setWindowFocusable(needsInput); getOverlayViewGlobalStateController().setWindowNeedsInput(needsInput); } |