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

Merge "Sync surface position for legacy app transition animation" into tm-qpr-dev

Browse Source
This commit is contained in:
Chris Li
2022-11-08 02:11:49 +00:00
committed by Android (Google) Code Review
parent 793936a15b 6d3f711632
commit a194e30908
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/TaskFragment.java
View File

@@ -2336,6 +2336,11 @@ class TaskFragment extends WindowContainer<WindowContainer> {
if (mTaskFragmentOrganizer != null if (mTaskFragmentOrganizer != null
&& (mLastSurfaceSize.x != 0 || mLastSurfaceSize.y != 0)) { && (mLastSurfaceSize.x != 0 || mLastSurfaceSize.y != 0)) {
t.setWindowCrop(mSurfaceControl, 0, 0); t.setWindowCrop(mSurfaceControl, 0, 0);
final SurfaceControl.Transaction syncTransaction = getSyncTransaction();
if (t != syncTransaction) {
// Avoid restoring to old window crop if the sync transaction is applied later.
syncTransaction.setWindowCrop(mSurfaceControl, 0, 0);
}
mLastSurfaceSize.set(0, 0); mLastSurfaceSize.set(0, 0);
} }
} }

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

@@ -3271,9 +3271,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
void resetSurfacePositionForAnimationLeash(Transaction t) { void resetSurfacePositionForAnimationLeash(Transaction t) {
t.setPosition(mSurfaceControl, 0, 0); t.setPosition(mSurfaceControl, 0, 0);
if (mSyncState != SYNC_STATE_NONE && t != mSyncTransaction) { final SurfaceControl.Transaction syncTransaction = getSyncTransaction();
if (t != syncTransaction) {
// Avoid restoring to old position if the sync transaction is applied later. // Avoid restoring to old position if the sync transaction is applied later.
mSyncTransaction.setPosition(mSurfaceControl, 0, 0); syncTransaction.setPosition(mSurfaceControl, 0, 0);
} }
mLastSurfacePosition.set(0, 0); mLastSurfacePosition.set(0, 0);
} }