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

Merge "Don't ignore app requested rotation on near-square screens"

Browse Source
This commit is contained in:
Andrii Kulian
2020-09-09 21:33:28 +00:00
committed by Android (Google) Code Review
parent 38cc1531f3 d32bda7bb3
commit 0ba5bf6df3
4 changed files with 9 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -6643,8 +6643,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
final Configuration resolvedConfig = getResolvedOverrideConfiguration();
final Rect resolvedBounds = resolvedConfig.windowConfiguration.getBounds();
final int requestedOrientation = getRequestedConfigurationOrientation();
final boolean orientationRequested = requestedOrientation != ORIENTATION_UNDEFINED
&& !mDisplayContent.ignoreRotationForApps();
final boolean orientationRequested = requestedOrientation != ORIENTATION_UNDEFINED;
final int orientation = orientationRequested
? requestedOrientation
: newParentConfiguration.orientation;

32
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -28,7 +28,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
import static android.content.res.Configuration.ORIENTATION_UNDEFINED;
@@ -366,13 +365,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
@VisibleForTesting
final float mCloseToSquareMaxAspectRatio;
/**
* If this is true, we would not rotate the display for apps. The rotation would be either the
* sensor rotation or the user rotation, controlled by
* {@link WindowManagerPolicy.UserRotationMode}.
*/
private boolean mIgnoreRotationForApps;
/**
* Keep track of wallpaper visibility to notify changes.
*/
@@ -1757,26 +1749,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
mDisplayFrames.onDisplayInfoUpdated(mDisplayInfo,
calculateDisplayCutoutForRotation(mDisplayInfo.rotation));
// Not much of use to rotate the display for apps since it's close to square.
mIgnoreRotationForApps = isNonDecorDisplayCloseToSquare(Surface.ROTATION_0, width, height);
}
/** @return {@code true} if the orientation requested from application will be ignored. */
boolean ignoreRotationForApps() {
return mIgnoreRotationForApps;
}
private boolean isNonDecorDisplayCloseToSquare(int rotation, int width, int height) {
final DisplayCutout displayCutout =
calculateDisplayCutoutForRotation(rotation).getDisplayCutout();
final int uiMode = mWmService.mPolicy.getUiMode();
final int w = mDisplayPolicy.getNonDecorDisplayWidth(
width, height, rotation, uiMode, displayCutout);
final int h = mDisplayPolicy.getNonDecorDisplayHeight(
width, height, rotation, uiMode, displayCutout);
final float aspectRatio = Math.max(w, h) / (float) Math.min(w, h);
return aspectRatio <= mCloseToSquareMaxAspectRatio;
}
/**
@@ -2342,10 +2314,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
int getOrientation() {
mLastOrientationSource = null;
if (mIgnoreRotationForApps) {
return SCREEN_ORIENTATION_USER;
}
if (mWmService.mDisplayFrozen) {
if (mWmService.mPolicy.isKeyguardLocked()) {
// Use the last orientation the while the display is frozen with the keyguard

8
services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
View File

@@ -24,7 +24,6 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER;
import static android.os.Build.VERSION_CODES.P;
import static android.os.Build.VERSION_CODES.Q;
import static android.view.Display.DEFAULT_DISPLAY;
@@ -762,13 +761,14 @@ public class DisplayContentTests extends WindowTestsBase {
window.mAttrs.screenOrientation, dc.getOrientation());
// ----------------------------
// Test close-to-square display
// Test close-to-square display - should be handled in the same way
// ----------------------------
dc.mBaseDisplayHeight = dc.mBaseDisplayWidth;
dc.configureDisplayPolicy();
assertEquals("Screen orientation must be SCREEN_ORIENTATION_USER.",
SCREEN_ORIENTATION_USER, dc.getOrientation());
assertEquals(
"Screen orientation must be defined by the window even on close-to-square display.",
window.mAttrs.screenOrientation, dc.getOrientation());
}
@Test

19
services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
View File

@@ -138,8 +138,6 @@ public class SizeCompatTests extends WindowTestsBase {
public void testFixedAspectRatioBoundsWithDecorInSquareDisplay() {
final int notchHeight = 100;
setUpApp(new TestDisplayContent.Builder(mAtm, 600, 800).setNotch(notchHeight).build());
// Rotation is ignored so because the display size is close to square (700/600<1.333).
assertTrue(mActivity.mDisplayContent.ignoreRotationForApps());
final Rect displayBounds = mActivity.mDisplayContent.getWindowConfiguration().getBounds();
final float aspectRatio = 1.2f;
@@ -163,23 +161,14 @@ public class SizeCompatTests extends WindowTestsBase {
mActivity.setRequestedOrientation(SCREEN_ORIENTATION_LANDSCAPE);
assertFitted();
// After the orientation of activity is changed, even display is not rotated, the aspect
// ratio should be the same (bounds=[0, 0 - 600, 600], appBounds=[0, 100 - 600, 600]).
// After the orientation of activity is changed, the display is rotated, the aspect
// ratio should be the same (bounds=[100, 0 - 800, 583], appBounds=[100, 0 - 800, 583]).
assertEquals(appBounds.width(), appBounds.height() * aspectRatio, 0.5f /* delta */);
// The notch is still on top.
assertEquals(mActivity.getBounds().height(), appBounds.height() + notchHeight);
// The notch is no longer on top.
assertEquals(appBounds, mActivity.getBounds());
mActivity.setRequestedOrientation(SCREEN_ORIENTATION_PORTRAIT);
assertFitted();
// Close-to-square display can rotate without being restricted by the requested orientation.
// The notch becomes on the left side. The activity is horizontal centered in 100 ~ 800.
// So the bounds and appBounds will be [200, 0 - 700, 600] (500x600) that is still fitted.
// Left = 100 + (800 - 100 - 500) / 2 = 200.
rotateDisplay(mActivity.mDisplayContent, ROTATION_90);
assertFitted();
assertEquals(appBounds.left,
notchHeight + (displayBounds.width() - notchHeight - appBounds.width()) / 2);
}
@Test