Merge "Don't hide the alternate bouncer on keyguardReset" into tm-qpr-dev (3b62ab70) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -733,7 +733,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		} else {
		showBouncerOrKeyguard(hideBouncerWhenShowing);
		}
		if (hideBouncerWhenShowing) {
		hideAlternateBouncer(false);
		}
		mKeyguardUpdateManager.sendKeyguardReset();
		updateStates();
		}

+26 −0

Original line number	Diff line number	Diff line
		@@ -683,4 +683,30 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		// the following call before registering centralSurfaces should NOT throw a NPE:
		mStatusBarKeyguardViewManager.hideAlternateBouncer(true);
		}

		@Test
		public void testResetHideBouncerWhenShowing_alternateBouncerHides() {
		// GIVEN the keyguard is showing
		reset(mAlternateBouncerInteractor);
		when(mKeyguardStateController.isShowing()).thenReturn(true);

		// WHEN SBKV is reset with hideBouncerWhenShowing=true
		mStatusBarKeyguardViewManager.reset(true);

		// THEN alternate bouncer is hidden
		verify(mAlternateBouncerInteractor).hide();
		}

		@Test
		public void testResetHideBouncerWhenShowingIsFalse_alternateBouncerHides() {
		// GIVEN the keyguard is showing
		reset(mAlternateBouncerInteractor);
		when(mKeyguardStateController.isShowing()).thenReturn(true);

		// WHEN SBKV is reset with hideBouncerWhenShowing=false
		mStatusBarKeyguardViewManager.reset(false);

		// THEN alternate bouncer is NOT hidden
		verify(mAlternateBouncerInteractor, never()).hide();
		}
		}