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

Commit a194e309 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

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

parents 793936a1 6d3f7116

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

+5 −0
Original line number Diff line number Diff line
@@ -2336,6 +2336,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
@@ -3271,9 +3271,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);

    }