Merge "AOD: Fix navbar flicker when launching assistant" into oc-dr1-dev am:... (0c7d12ac) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		*/
		public void reset(boolean hideBouncerWhenShowing) {
		if (mShowing) {
		if (mOccluded) {
		if (mOccluded && !mDozing) {
		mStatusBar.hideKeyguard();
		mStatusBar.stopWaitingForKeyguardExit();
		mBouncer.hide(false /* destroyView */);
		@@ -294,9 +294,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		}
		mStatusBarWindowManager.setKeyguardOccluded(occluded);

		// If Keyguard is reshown, don't hide the bouncer as it might just have been requested by
		// a FLAG_DISMISS_KEYGUARD_ACTIVITY.
		// setDozing(false) will call reset once we stop dozing.
		if (!mDozing) {
		// If Keyguard is reshown, don't hide the bouncer as it might just have been requested
		// by a FLAG_DISMISS_KEYGUARD_ACTIVITY.
		reset(false /* hideBouncerWhenShowing*/);
		}
		if (animate && !occluded && mShowing) {
		mStatusBar.animateKeyguardUnoccluding();
		}