Merge "Revert "[Bouncer] reset bouncer visibility with doze state."" into tm-qpr-dev (1c9f7129) · 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
		@@ -730,7 +730,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		private void setDozing(boolean dozing) {
		if (mDozing != dozing) {
		mDozing = dozing;
		reset(true /* hideBouncerWhenShowing */);
		if (dozing \|\| mBouncer.needsFullscreenBouncer() \|\| mOccluded) {
		reset(dozing /* hideBouncerWhenShowing */);
		}
		updateStates();

		if (!dozing) {

+0 −18

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static org.mockito.Mockito.clearInvocations;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.reset;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		@@ -526,21 +525,4 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		mBouncerExpansionCallback.onVisibilityChanged(false);
		verify(mCentralSurfaces).setBouncerShowingOverDream(false);
		}

		@Test
		public void testSetDozing_Dozing() {
		clearInvocations(mBouncer);
		mStatusBarKeyguardViewManager.onDozingChanged(true);
		// Once when shown and once with dozing changed.
		verify(mBouncer, times(1)).hide(false);
		}

		@Test
		public void testSetDozing_notDozing() {
		mStatusBarKeyguardViewManager.onDozingChanged(true);
		clearInvocations(mBouncer);
		mStatusBarKeyguardViewManager.onDozingChanged(false);
		// Once when shown and twice with dozing changed.
		verify(mBouncer, times(1)).hide(false);
		}
		}