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

Commit a285aff4 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Provide vsync id for all animation transactions (except PIP)"

parents d4c2928f 7fd56a8c

core/java/android/view/InsetsAnimationThreadControlRunner.java

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro 
                SyncRtSurfaceTransactionApplier.SurfaceParams surfaceParams = params[i];

                applyParams(t, surfaceParams, mTmpFloat9);

            }

            t.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());

            t.apply();

            t.close();

        }

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/DividerImeController.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.annotation.Nullable; 
import android.graphics.Rect;

import android.os.Handler;

import android.util.Slog;

import android.view.Choreographer;

import android.view.SurfaceControl;

import android.window.TaskOrganizer;

import android.window.WindowContainerToken;
@@ -338,6 +339,7 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor 
            SurfaceControl.Transaction t = mTransactionPool.acquire();

            float value = (float) animation.getAnimatedValue();

            onProgress(value, t);

            t.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());

            t.apply();

            mTransactionPool.release(t);

        });

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/DividerView.java

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.Handler; 
import android.os.RemoteException;

import android.util.AttributeSet;

import android.util.Slog;

import android.view.Choreographer;

import android.view.Display;

import android.view.MotionEvent;

import android.view.PointerIcon;
@@ -1108,6 +1109,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
            }

            resizeSplitSurfaces(t, mDockedRect, mDockedTaskRect, mOtherRect, mOtherTaskRect);

            if (ownTransaction) {

                t.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());

                t.apply();

                mTiles.releaseTransaction(t);

            }

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

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ class SurfaceAnimationRunner { 


    private void applyTransaction() {

        mFrameTransaction.setAnimationTransaction();

        mFrameTransaction.setFrameTimelineVsync(mChoreographer.getVsyncId());

        mFrameTransaction.apply();

        mApplyScheduled = false;

    }