Merge "Inject PipAnimationController into PipTaskOrg" into rvc-dev am: 29b158150d am: 93aad134db

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

Change-Id: I37c68db5b2389c3167311a0d68523377323a3f08
This commit is contained in:
TreeHugger Robot
2020-06-18 15:59:45 +00:00
committed by Automerger Merge Worker

View File

@@ -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);