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

Commit bb68dfec authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Send app bounds to Shell via stopSwipePipToHome" into main

parents bcdde0d1 221457f0

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

+2 −1
Original line number Diff line number Diff line
@@ -1572,7 +1572,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                        mSwipePipToHomeAnimator.getTaskId(),

                        mSwipePipToHomeAnimator.getComponentName(),

                        mSwipePipToHomeAnimator.getDestinationBounds(),

                        mSwipePipToHomeAnimator.getContentOverlay());

                        mSwipePipToHomeAnimator.getContentOverlay(),

                        mSwipePipToHomeAnimator.getAppBounds());



                windowAnim = mSwipePipToHomeAnimators;

            } else {

quickstep/src/com/android/quickstep/SystemUiProxy.java

+3 −2
Original line number Diff line number Diff line
@@ -630,10 +630,11 @@ public class SystemUiProxy implements ISystemUiProxy { 
     * should be responsible for cleaning up the overlay.

     */

    public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds,

            SurfaceControl overlay) {

            SurfaceControl overlay, Rect appBounds) {

        if (mPip != null) {

            try {

                mPip.stopSwipePipToHome(taskId, componentName, destinationBounds, overlay);

                mPip.stopSwipePipToHome(taskId, componentName, destinationBounds, overlay,

                        appBounds);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed call stopSwipePipToHome");

            }

quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java

+4 −0
Original line number Diff line number Diff line
@@ -264,6 +264,10 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { 
        return mDestinationBounds;

    }



    public Rect getAppBounds() {

        return mAppBounds;

    }



    @Nullable

    public SurfaceControl getContentOverlay() {

        return mPipContentOverlay == null ? null : mPipContentOverlay.getLeash();