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

Commit 93aad134 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Inject PipAnimationController into PipTaskOrg" into rvc-dev am: 29b15815 

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

Change-Id: I21456a84dc05dfa912958a78cc5d4c2bc531124d
parents 32774d47 29b15815

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+3 −2
Original line number Diff line number Diff line
@@ -202,14 +202,15 @@ public class PipTaskOrganizer extends TaskOrganizer implements 
    public PipTaskOrganizer(Context context, @NonNull PipBoundsHandler boundsHandler,

            @NonNull PipSurfaceTransactionHelper surfaceTransactionHelper,

            @Nullable Divider divider,

            @NonNull DisplayController displayController) {

            @NonNull DisplayController displayController,

            @NonNull PipAnimationController pipAnimationController) {

        mMainHandler = new Handler(Looper.getMainLooper());

        mUpdateHandler = new Handler(PipUpdateThread.get().getLooper(), mUpdateCallbacks);

        mPipBoundsHandler = boundsHandler;

        mEnterExitAnimationDuration = context.getResources()

                .getInteger(R.integer.config_pipResizeAnimationDuration);

        mSurfaceTransactionHelper = surfaceTransactionHelper;

        mPipAnimationController = new PipAnimationController(context, surfaceTransactionHelper);

        mPipAnimationController = pipAnimationController;

        mSurfaceControlTransactionFactory = SurfaceControl.Transaction::new;

        mSplitDivider = divider;

        displayController.addDisplayWindowListener(this);