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 am: a194e30908 am: c80457927b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20372005

Change-Id: I7bbc3a11903494e027a039abedf9e9043af8a249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-11-08 03:37:24 +00:00
committed by Automerger Merge Worker
parent 0fc931f2a1 c80457927b
commit 3ef0cc3062
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

@@ -2327,6 +2327,11 @@ class TaskFragment extends WindowContainer<WindowContainer> {
if (mTaskFragmentOrganizer != null
&& (mLastSurfaceSize.x != 0 || mLastSurfaceSize.y != 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);
}
}

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

@@ -3277,9 +3277,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
void resetSurfacePositionForAnimationLeash(Transaction t) {
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.
mSyncTransaction.setPosition(mSurfaceControl, 0, 0);
syncTransaction.setPosition(mSurfaceControl, 0, 0);
}
mLastSurfacePosition.set(0, 0);
}