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

Commit 221457f0 authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

Send app bounds to Shell via stopSwipePipToHome 

Send app bounds used for content overlay by launcher
to Shell's PiP component. This is used by Shell to
reset overlay scale and offset properly after the enter animation
but before the overlay fades out to avoid icon shifts.

We observed that app bounds can be different depending on
whether we are at 90 deg or 270 deg before fixed rotation.
Moreover, the presence of the taskbar can also alter the app bounds.
So supplying the app bounds we take from task view simulator to Shell
should solve the issue in general.

Flag: NONE
Bug: 316993346
Test: manually enter PiP w/ fixed rotation in 90 or 270 deg
Change-Id: I0a26b0c69020dae399d6794d36a9f3bc8425f40b
parent e228112c

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

+2 −1
Original line number Diff line number Diff line
@@ -1574,7 +1574,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
@@ -265,6 +265,10 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim { 
        return mDestinationBounds;

    }



    public Rect getAppBounds() {

        return mAppBounds;

    }



    @Nullable

    public SurfaceControl getContentOverlay() {

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