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

Commit 5f2b7242 authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Revert^2 "Prevent taskbar animation for contextual split from home" 

This reverts commit 8b78849c.

Reason for revert: Did not fix failing test b/323418145

Change-Id: Ic0897dda930a76aa27fba6e9de925b653d63a7f4
parent 8b78849c

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+9 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.launcher3.taskbar;



import static com.android.launcher3.QuickstepTransitionManager.TRANSIENT_TASKBAR_TRANSITION_DURATION;

import static com.android.launcher3.config.FeatureFlags.enableSplitContextually;

import static com.android.launcher3.statemanager.BaseState.FLAG_NON_INTERACTIVE;

import static com.android.launcher3.taskbar.TaskbarEduTooltipControllerKt.TOOLTIP_STEP_FEATURES;

import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_VISIBLE;
@@ -214,7 +215,14 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
        }



        mTaskbarLauncherStateController.updateStateForFlag(FLAG_VISIBLE, isVisible);

        return mTaskbarLauncherStateController.applyState(fromInit ? 0 : duration, startAnimation);

        // TODO(b/308851855): Skip animation for launching split from home, will refine later

        boolean skipAnimForSplit = enableSplitContextually() &&

                mLauncher.areBothSplitAppsConfirmed() &&

                mLauncher.getStateManager().getState() == LauncherState.NORMAL;

        if (skipAnimForSplit || fromInit) {

            duration = 0;

        }

        return mTaskbarLauncherStateController.applyState(duration, startAnimation);

    }



    @Override

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+4 −0
Original line number Diff line number Diff line
@@ -729,6 +729,10 @@ public class QuickstepLauncher extends Launcher { 
        return mSplitSelectStateController.isSplitSelectActive();

    }



    public boolean areBothSplitAppsConfirmed() {

        return mSplitSelectStateController.isBothSplitAppsConfirmed();

    }



    @Override

    public void onStateTransitionCompletedAfterSwipeToHome(LauncherState finalState) {

        if (mTaskbarUIController != null) {