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

Commit 45b8d39a authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Notify WMShell on aborting auto-enter-pip 

Note that this change does not fix the bug listed here. This is to
callback WMShell when the transition is aborted and WMShell can choose
how to handle this.

Bug: 283177443
Test: adb shell dumpsys activity service SystemUIService WMShell
Test: go/winscope and check the SF/WM dump
Change-Id: I8abfc2db47d1f0bfc3d400066936bed354743420
parent 5a001520

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

+16 −2
Original line number Diff line number Diff line
@@ -2041,8 +2041,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        if (!hasTargets() || mRecentsAnimationController == null) {

            // If there are no targets or the animation not started, then there is nothing to finish

            mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

            maybeAbortSwipePipToHome();

        } else {

            maybeFinishSwipeToHome();

            maybeFinishSwipePipToHome();

            finishRecentsControllerToHome(

                    () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));

        }
@@ -2053,12 +2054,25 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
        doLogGesture(HOME, mRecentsView == null ? null : mRecentsView.getCurrentPageTaskView());

    }



    /**

     * Notifies SysUI that transition is aborted if applicable and also pass leash transactions

     * from Launcher to WM.

     */

    private void maybeAbortSwipePipToHome() {

        if (mIsSwipingPipToHome && mSwipePipToHomeAnimators[0] != null) {

            SystemUiProxy.INSTANCE.get(mContext).abortSwipePipToHome(

                    mSwipePipToHomeAnimator.getTaskId(),

                    mSwipePipToHomeAnimator.getComponentName());

            mIsSwipingPipToHome = false;

        }

    }



    /**

     * Notifies SysUI that transition is finished if applicable and also pass leash transactions

     * from Launcher to WM.

     * This should happen before {@link #finishRecentsControllerToHome(Runnable)}.

     */

    private void maybeFinishSwipeToHome() {

    private void maybeFinishSwipePipToHome() {

        if (mIsSwipingPipToHome && mSwipePipToHomeAnimators[0] != null) {

            SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(

                    mSwipePipToHomeAnimator.getTaskId(),

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

+14 −0
Original line number Diff line number Diff line
@@ -564,6 +564,20 @@ public class SystemUiProxy implements ISystemUiProxy { 
        }

    }



    /**

     * Notifies WM Shell that launcher has aborted all the animation for swipe to home. WM Shell

     * can use this callback to clean up its internal states.

     */

    public void abortSwipePipToHome(int taskId, ComponentName componentName) {

        if (mPip != null) {

            try {

                mPip.abortSwipePipToHome(taskId, componentName);

            } catch (RemoteException e) {

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

            }

        }

    }



    /**

     * Sets the next pip animation type to be the alpha animation.

     */