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

Commit 3948ad07 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Sync surface position for animation in core" into tm-qpr-dev am: ba151e62 

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



Change-Id: Ib4d1ee80f06c76f85411a8a31dbf74acb7eaa470
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 062f1490 ba151e62

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

+4 −0
Original line number Diff line number Diff line
@@ -3216,6 +3216,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 


    void resetSurfacePositionForAnimationLeash(Transaction t) {

        t.setPosition(mSurfaceControl, 0, 0);

        if (mSyncState != SYNC_STATE_NONE && t != mSyncTransaction) {

            // Avoid restoring to old position if the sync transaction is applied later.

            mSyncTransaction.setPosition(mSurfaceControl, 0, 0);

        }

        mLastSurfacePosition.set(0, 0);

    }