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

Commit 8fbf8197 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Send source rect hint to Shell via stopSwipePipToHome" into main

parents dafbaa5f 684ee34f

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

+2 −1
Original line number Diff line number Diff line
@@ -1614,7 +1614,8 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
                        mSwipePipToHomeAnimator.getComponentName(),

                        mSwipePipToHomeAnimator.getDestinationBounds(),

                        mSwipePipToHomeAnimator.getContentOverlay(),

                        mSwipePipToHomeAnimator.getAppBounds());

                        mSwipePipToHomeAnimator.getAppBounds(),

                        mSwipePipToHomeAnimator.getSourceRectHint());



                windowAnim = mSwipePipToHomeAnimators;

            } else {

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

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

     */

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

            SurfaceControl overlay, Rect appBounds) {

            SurfaceControl overlay, Rect appBounds, Rect sourceRectHint) {

        if (mPip != null) {

            try {

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

                        appBounds);

                        appBounds, sourceRectHint);

            } 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
@@ -267,6 +267,10 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { 
        return mAppBounds;

    }



    public Rect getSourceRectHint() {

        return mSourceRectHint;

    }



    @Nullable

    public SurfaceControl getContentOverlay() {

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