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

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

Merge "Revert "Prevent taskbar animation for contextual split from home"" into main

parents 35175503 8b78849c

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

+1 −9
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
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;
@@ -215,14 +214,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
        }



        mTaskbarLauncherStateController.updateStateForFlag(FLAG_VISIBLE, isVisible);

        // 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);

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

    }



    @Override

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

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

    }



    public boolean areBothSplitAppsConfirmed() {

        return mSplitSelectStateController.isBothSplitAppsConfirmed();

    }



    @Override

    public void onStateTransitionCompletedAfterSwipeToHome(LauncherState finalState) {

        if (mTaskbarUIController != null) {