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

Commit f40262a6 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

End recents animation when entering split select 

Allow starting split selection from live tile task.
Animation is still funky, but that's in a separate
CL altogether.

Fixes: 193212975
Test: Repro steps in bug no longer happen
Change-Id: I507628d3ef474936694dfbabfef5e0acf9f55b5d
parent 5bd21741

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

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ public class SystemUiProxy implements ISystemUiProxy, 
            try {

                mSystemUiProxy.setSplitScreenMinimized(minimized);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed call stopScreenPinning", e);

                Log.w(TAG, "Failed call setSplitScreenMinimized", e);

            }

        }

    }

quickstep/src/com/android/quickstep/views/RecentsView.java

+3 −0
Original line number Diff line number Diff line
@@ -3088,6 +3088,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                splitController.getLayoutParamsForActivePosition(getResources(),

                        mActivity.getDeviceProfile()));

        mSplitPlaceholderView.setIcon(taskView.getIconView());

        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            finishRecentsAnimation(true, null);

        }

    }



    public PendingAnimation createSplitSelectInitAnimation() {

quickstep/src/com/android/quickstep/views/TaskView.java

+13 −7
Original line number Diff line number Diff line
@@ -531,6 +531,9 @@ public class TaskView extends FrameLayout implements Reusable { 
        if (getTask() == null) {

            return;

        }

        if (confirmSecondSplitSelectApp()) {

            return;

        }

        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {

            if (!mIsClickableAsLiveTile) {

                return;
@@ -549,7 +552,7 @@ public class TaskView extends FrameLayout implements Reusable { 
            if (targets == null) {

                // If the recents animation is cancelled somehow between the parent if block and

                // here, try to launch the task as a non live tile task.

                launcherNonLiveTileTask();

                launchTaskAnimated();

                return;

            }
@@ -567,19 +570,22 @@ public class TaskView extends FrameLayout implements Reusable { 
            });

            anim.start();

        } else {

            launcherNonLiveTileTask();

            launchTaskAnimated();

        }

        mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())

                .log(LAUNCHER_TASK_LAUNCH_TAP);

    }



    private void launcherNonLiveTileTask() {

        if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {

            // User tapped to select second split screen app

    /**

     * @return {@code true} if user is already in split select mode and this tap was to choose the

     *         second app. {@code false} otherwise

     */

    private boolean confirmSecondSplitSelectApp() {

        boolean isSelectingSecondSplitApp = mActivity.isInState(OVERVIEW_SPLIT_SELECT);

        if (isSelectingSecondSplitApp) {

            getRecentsView().confirmSplitSelect(this);

        } else {

            launchTaskAnimated();

        }

        return isSelectingSecondSplitApp;

    }



    /**