Merge "[Bouncer] Force bouncer into portrait mode." into tm-dev (b560e960) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -333,7 +333,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		}

		private void adjustScreenOrientation(State state) {
		if (state.isKeyguardShowingAndNotOccluded() \|\| state.mDozing) {
		if (state.mBouncerShowing \|\| state.isKeyguardShowingAndNotOccluded() \|\| state.mDozing) {
		if (mKeyguardStateController.isKeyguardScreenRotationAllowed()) {
		mLpChanged.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_USER;
		} else {

+14 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.atLeastOnce;
		import static org.mockito.Mockito.clearInvocations;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.reset;
		@@ -309,4 +310,17 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase {
		});
		verify(mWindowManager).updateViewLayout(any(), any());
		}

		@Test
		public void bouncerShowing_OrientationNoSensor() {
		mNotificationShadeWindowController.setKeyguardShowing(true);
		mNotificationShadeWindowController.setKeyguardOccluded(true);
		mNotificationShadeWindowController.setBouncerShowing(true);
		when(mKeyguardStateController.isKeyguardScreenRotationAllowed()).thenReturn(false);
		mNotificationShadeWindowController.onConfigChanged(new Configuration());

		verify(mWindowManager, atLeastOnce()).updateViewLayout(any(), mLayoutParameters.capture());
		assertThat(mLayoutParameters.getValue().screenOrientation)
		.isEqualTo(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
		}
		}