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

Commit a4babdb6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Transfer PipContentOverlay when swipe to home with Shell transition" into tm-dev

parents 6166bbff 411c1b48
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1768,6 +1768,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
    private void maybeFinishSwipeToHome() {
        if (mIsSwipingPipToHome && mSwipePipToHomeAnimators[0] != null) {
            SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(
                    mSwipePipToHomeAnimator.getTaskId(),
                    mSwipePipToHomeAnimator.getComponentName(),
                    mSwipePipToHomeAnimator.getDestinationBounds(),
                    mSwipePipToHomeAnimator.getContentOverlay());
+7 −2
Original line number Diff line number Diff line
@@ -541,11 +541,16 @@ public class SystemUiProxy implements ISystemUiProxy,
        return null;
    }

    public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds,
    /**
     * Notifies WM Shell that launcher has finished all the animation for swipe to home. WM Shell
     * can choose to fade out the overlay when entering PIP is finished, and WM Shell should be
     * responsible for cleaning up the overlay.
     */
    public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds,
            SurfaceControl overlay) {
        if (mPip != null) {
            try {
                mPip.stopSwipePipToHome(componentName, destinationBounds, overlay);
                mPip.stopSwipePipToHome(taskId, componentName, destinationBounds, overlay);
            } catch (RemoteException e) {
                Log.w(TAG, "Failed call stopSwipePipToHome");
            }