Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia574bdf832b1d8d3013ffe5c2da7cfbe4c2e4f31
This commit is contained in:
TreeHugger Robot
2020-06-18 15:44:49 +00:00
committed by Automerger Merge Worker
parent 5b8bf3839b 29b158150d
commit 2e5dd0c4c9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
View File

@@ -202,14 +202,15 @@ public class PipTaskOrganizer extends TaskOrganizer implements
public PipTaskOrganizer(Context context, @NonNull PipBoundsHandler boundsHandler, public PipTaskOrganizer(Context context, @NonNull PipBoundsHandler boundsHandler,
@NonNull PipSurfaceTransactionHelper surfaceTransactionHelper, @NonNull PipSurfaceTransactionHelper surfaceTransactionHelper,
@Nullable Divider divider, @Nullable Divider divider,
@NonNull DisplayController displayController) { @NonNull DisplayController displayController,
@NonNull PipAnimationController pipAnimationController) {
mMainHandler = new Handler(Looper.getMainLooper()); mMainHandler = new Handler(Looper.getMainLooper());
mUpdateHandler = new Handler(PipUpdateThread.get().getLooper(), mUpdateCallbacks); mUpdateHandler = new Handler(PipUpdateThread.get().getLooper(), mUpdateCallbacks);
mPipBoundsHandler = boundsHandler; mPipBoundsHandler = boundsHandler;
mEnterExitAnimationDuration = context.getResources() mEnterExitAnimationDuration = context.getResources()
.getInteger(R.integer.config_pipResizeAnimationDuration); .getInteger(R.integer.config_pipResizeAnimationDuration);
mSurfaceTransactionHelper = surfaceTransactionHelper; mSurfaceTransactionHelper = surfaceTransactionHelper;
mPipAnimationController = new PipAnimationController(context, surfaceTransactionHelper); mPipAnimationController = pipAnimationController;
mSurfaceControlTransactionFactory = SurfaceControl.Transaction::new; mSurfaceControlTransactionFactory = SurfaceControl.Transaction::new;
mSplitDivider = divider; mSplitDivider = divider;
displayController.addDisplayWindowListener(this); displayController.addDisplayWindowListener(this);