Merge "Bugfix: PIN keyguard is clipped in Car" into pi-dev am: 90101793e5 (be79a70b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBarKeyguardViewManager.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -28,4 +28,15 @@ public class CarStatusBarKeyguardViewManager extends StatusBarKeyguardViewManage
		CarStatusBar statusBar = (CarStatusBar) mStatusBar;
		statusBar.setNavBarVisibility(navBarVisible ? View.VISIBLE : View.GONE);
		}

		/**
		* Car is a multi-user system. There's a cancel button on the bouncer that allows the user to
		* go back to the user switcher and select another user. Different user may have different
		* security mode which requires bouncer container to be resized. For this reason, the bouncer
		* view is destroyed on cancel.
		*/
		@Override
		protected boolean shouldDestroyViewOnReset() {
		return true;
		}
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -206,13 +206,17 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		} else {
		mStatusBar.showKeyguard();
		if (hideBouncerWhenShowing) {
		hideBouncer(false /* destroyView */);
		hideBouncer(shouldDestroyViewOnReset() /* destroyView */);
		mBouncer.prepare();
		}
		}
		updateStates();
		}

		protected boolean shouldDestroyViewOnReset() {
		return false;
		}

		private void hideBouncer(boolean destroyView) {
		mBouncer.hide(destroyView);
		cancelPendingWakeupAction();