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

Merge "Use pending transaction for setting transform hint" into udc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2023-05-05 05:48:24 +00:00
committed by Android (Google) Code Review
parent 0d4cf06b31 1bc6b35487
commit 9b195e0a78
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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