From 0c449ec2ef462220df37f31aadcaf7508c53073d Mon Sep 17 00:00:00 2001
From: "jorgegil@google.com" <jorgegil@google.com>
Date: Tue, 16 Jun 2020 16:30:07 -0700
Subject: [PATCH] Inject PipAnimationController into PipTaskOrg

Allows easier mocking in unit tests.

Bug: 159165010
Test: atest SystemUITests
Change-Id: Ib3efe837c14c140890e3b1b10a17579c7ceb9449
---
 .../src/com/android/systemui/pip/PipTaskOrganizer.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
index b93e07e65c737..beb9f5b052b1c 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
@@ -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);