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

Commit 80988aba authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Expose the full task info with the remote animation target" into sc-dev

parents ab947646 cbfbc749

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+5 −4
Original line number Diff line number Diff line
@@ -1071,9 +1071,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
            HomeAnimationFactory homeAnimFactory = createHomeAnimationFactory(duration);

            mIsSwipingPipToHome = homeAnimFactory.supportSwipePipToHome()

                    && runningTaskTarget != null

                    && runningTaskTarget.pictureInPictureParams != null

                    && runningTaskTarget.taskInfo.pictureInPictureParams != null

                    && TaskInfoCompat.isAutoEnterPipEnabled(

                            runningTaskTarget.pictureInPictureParams);

                            runningTaskTarget.taskInfo.pictureInPictureParams);

            if (mIsSwipingPipToHome) {

                mSwipePipToHomeAnimator = getSwipePipToHomeAnimator(

                        homeAnimFactory, runningTaskTarget, start);
@@ -1161,7 +1161,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        final Rect destinationBounds = SystemUiProxy.INSTANCE.get(mContext)

                .startSwipePipToHome(taskInfo.topActivity,

                        TaskInfoCompat.getTopActivityInfo(taskInfo),

                        runningTaskTarget.pictureInPictureParams,

                        runningTaskTarget.taskInfo.pictureInPictureParams,

                        homeRotation,

                        mDp.hotseatBarSizePx);

        final Rect startBounds = new Rect();
@@ -1170,7 +1170,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                runningTaskTarget.taskId,

                taskInfo.topActivity,

                runningTaskTarget.leash.getSurfaceControl(),

                TaskInfoCompat.getPipSourceRectHint(runningTaskTarget.pictureInPictureParams),

                TaskInfoCompat.getPipSourceRectHint(

                        runningTaskTarget.taskInfo.pictureInPictureParams),

                TaskInfoCompat.getWindowConfigurationBounds(taskInfo),

                startBounds,

                destinationBounds,

src/com/android/launcher3/BaseDraggingActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.graphics.Insets; 
import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.Binder;

import android.os.Bundle;

import android.os.Process;

import android.os.StrictMode;