Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Also reverse rotation for #freezeRotation path" into tm-qpr-dev

Browse Source
This commit is contained in:
Kevin Chyn
2023-04-26 00:01:20 +00:00
committed by Android (Google) Code Review
parent 8c2291cc18 4c2b792c11
commit d095a5e3fe
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/DisplayRotation.java
View File

@@ -913,6 +913,16 @@ public class DisplayRotation {
} }
void freezeRotation(int rotation) { void freezeRotation(int rotation) {
if (mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()) {
// Flipping 270 and 90 has the same effect as changing the direction which rotation is
// applied.
if (rotation == Surface.ROTATION_90) {
rotation = Surface.ROTATION_270;
} else if (rotation == Surface.ROTATION_270) {
rotation = Surface.ROTATION_90;
}
}
rotation = (rotation == -1) ? mRotation : rotation; rotation = (rotation == -1) ? mRotation : rotation;
setUserRotation(WindowManagerPolicy.USER_ROTATION_LOCKED, rotation); setUserRotation(WindowManagerPolicy.USER_ROTATION_LOCKED, rotation);
} }

18
services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
View File

@@ -537,6 +537,24 @@ public class DisplayRotationTests {
SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_180)); SCREEN_ORIENTATION_UNSPECIFIED, Surface.ROTATION_180));
} }
@Test
public void testFreezeRotation_reverseRotationDirectionAroundZAxis_yes() throws Exception {
mBuilder.build();
when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()).thenReturn(true);
freezeRotation(Surface.ROTATION_90);
assertEquals(Surface.ROTATION_270, mTarget.getUserRotation());
}
@Test
public void testFreezeRotation_reverseRotationDirectionAroundZAxis_no() throws Exception {
mBuilder.build();
when(mDeviceStateController.shouldReverseRotationDirectionAroundZAxis()).thenReturn(false);
freezeRotation(Surface.ROTATION_90);
assertEquals(Surface.ROTATION_90, mTarget.getUserRotation());
}
private boolean waitForUiHandler() { private boolean waitForUiHandler() {
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
UiThread.getHandler().post(latch::countDown); UiThread.getHandler().post(latch::countDown);