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

Merge "Distinguish between landscape and seascape"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-02 18:08:48 +00:00
committed by Android (Google) Code Review
parent 4b81c6234c 3e595fe8d4
commit e594dd84ca
2 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1057,11 +1057,19 @@ public class DisplayRotation {
preferredRotation = lastRotation;
}
} else if (mUserRotationMode == WindowManagerPolicy.USER_ROTATION_LOCKED
&& orientation != ActivityInfo.SCREEN_ORIENTATION_NOSENSOR) {
// Apply rotation lock. Does not apply to NOSENSOR.
&& orientation != ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
&& orientation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
&& orientation != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
&& orientation != ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
&& orientation != ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT) {
// Apply rotation lock. Does not apply to NOSENSOR or specific rotations.
// The idea is that the user rotation expresses a weak preference for the direction
// of gravity and as NOSENSOR is never affected by gravity, then neither should
// NOSENSOR be affected by rotation lock (although it will be affected by docks).
// Also avoid setting user rotation when app has preference over one particular rotation
// to avoid leaving the rotation to the reverse of it which has the compatible
// orientation, but isn't what app wants, when the user rotation is the reverse of the
// preferred rotation.
preferredRotation = mUserRotation;
} else {
// No overriding preference.

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

@@ -238,15 +238,55 @@ public class DisplayRotationTests {
}
@Test
public void testReturnsUserRotation_UserRotationLocked_CompatibleAppRequest()
public void testReturnsLandscape_UserRotationLockedSeascape_AppRequestsLandscape()
throws Exception {
mBuilder.build();
configureDisplayRotation(SCREEN_ORIENTATION_LANDSCAPE, false, false);
configureDisplayRotation(SCREEN_ORIENTATION_LANDSCAPE, false /* isCar */,
false /* isTv */);
freezeRotation(Surface.ROTATION_180);
assertEquals(Surface.ROTATION_0, mTarget.rotationForOrientation(
ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, Surface.ROTATION_90));
}
@Test
public void testReturnsSeascape_UserRotationLockedSeascape_AppRequestsSeascape()
throws Exception {
mBuilder.build();
configureDisplayRotation(SCREEN_ORIENTATION_LANDSCAPE, false /* isCar */,
false /* isTv */);
freezeRotation(Surface.ROTATION_180);
assertEquals(Surface.ROTATION_180, mTarget.rotationForOrientation(
ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, Surface.ROTATION_90));
ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE, Surface.ROTATION_90));
}
@Test
public void testReturnsPortrait_UserRotationLockedPortrait_AppRequestsPortrait()
throws Exception {
mBuilder.build();
configureDisplayRotation(SCREEN_ORIENTATION_LANDSCAPE, false /* isCar */,
false /* isTv */);
freezeRotation(Surface.ROTATION_270);
assertEquals(Surface.ROTATION_270, mTarget.rotationForOrientation(
ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, Surface.ROTATION_0));
}
@Test
public void testReturnsUpsideDown_UserRotationLockedUpsideDown_AppRequestsUpsideDown()
throws Exception {
mBuilder.build();
configureDisplayRotation(SCREEN_ORIENTATION_LANDSCAPE, false /* isCar */,
false /* isTv */);
freezeRotation(Surface.ROTATION_90);
assertEquals(Surface.ROTATION_90, mTarget.rotationForOrientation(
ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT, Surface.ROTATION_0));
}
@Test