Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ef0cc30 authored Nov 08, 2022 by Chris Li Committed by Automerger Merge Worker Nov 08, 2022

Merge "Sync surface position for legacy app transition animation" into...

Merge "Sync surface position for legacy app transition animation" into tm-qpr-dev am: a194e309 am: c8045792

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>

parents 0fc931f2 c8045792

services/core/java/com/android/server/wm/TaskFragment.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

services/core/java/com/android/server/wm/WindowContainer.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}