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

Merge "Set fixed transform hint on app level rotated surface" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-27 01:53:38 +00:00
committed by Android (Google) Code Review
parent 836df19fd0 61e037a7b7
commit 313b180b50
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3594,8 +3594,11 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
&& !mTransitionController.useShellTransitionsRotation()) {
if (deltaRotation != Surface.ROTATION_0) {
updateSurfaceRotation(t, deltaRotation, null /* positionLeash */);
t.setFixedTransformHint(mSurfaceControl,
getWindowConfiguration().getDisplayRotation());
} else if (deltaRotation != mLastDeltaRotation) {
t.setMatrix(mSurfaceControl, 1, 0, 0, 1);
t.unsetFixedTransformHint(mSurfaceControl);
}
}
mLastDeltaRotation = deltaRotation;

1
services/core/java/com/android/server/wm/WindowToken.java
View File

@@ -596,6 +596,7 @@ class WindowToken extends WindowContainer<WindowState> {
.build();
t.setPosition(leash, mLastSurfacePosition.x, mLastSurfacePosition.y);
t.reparent(getSurfaceControl(), leash);
t.setFixedTransformHint(leash, getWindowConfiguration().getDisplayRotation());
mFixedRotationTransformLeash = leash;
updateSurfaceRotation(t, rotation, mFixedRotationTransformLeash);
return mFixedRotationTransformLeash;

22
services/tests/wmtests/src/com/android/server/wm/SurfaceControlTests.java
View File

@@ -125,9 +125,10 @@ public class SurfaceControlTests {
public void testSurfaceChangedOnRotation() {
final Instrumentation instrumentation = getInstrumentation();
final Context context = instrumentation.getContext();
final Activity activity = instrumentation.startActivitySync(new Intent().setComponent(
final Intent intent = new Intent().setComponent(
new ComponentName(context, ActivityOptionsTest.MainActivity.class))
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
final Activity activity = instrumentation.startActivitySync(intent);
final SurfaceView sv = new SurfaceView(activity);
final AtomicInteger surfaceChangedCount = new AtomicInteger();
instrumentation.runOnMainSync(() -> activity.setContentView(sv));
@@ -157,12 +158,27 @@ public class SurfaceControlTests {
instrumentation.waitForIdleSync();
final int newRotation = activity.getResources().getConfiguration()
.windowConfiguration.getRotation();
if (rotation == newRotation) {
// The device might not support requested orientation.
activity.finishAndRemoveTask();
return;
}
final int count = surfaceChangedCount.get();
activity.moveTaskToBack(true /* nonRoot */);
instrumentation.getUiAutomation().syncInputTransactions();
context.startActivity(intent);
instrumentation.getUiAutomation().syncInputTransactions();
final int countAfterToFront = count - surfaceChangedCount.get();
activity.finishAndRemoveTask();
// The first count is triggered from creation, so the target number is 2.
if (rotation != newRotation && count > 2) {
if (count > 2) {
fail("More than once surfaceChanged for rotation change: " + count);
}
if (countAfterToFront > 1) {
fail("More than once surfaceChanged for app transition with rotation change: "
+ countAfterToFront);
}
}
private SurfaceControl buildTestSurface() {