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

Commit 745010e6 authored by Pat Manning's avatar Pat Manning Committed by Automerger Merge Worker
Browse files

Merge "Revert "Stash taskbar on swipe to go home for 3p fallback launcher.""... 

Merge "Revert "Stash taskbar on swipe to go home for 3p fallback launcher."" into tm-qpr-dev am: c58e2be2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22119024



Change-Id: Iaa33b85cdc5f90bbac962e7272815756a105ed11
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91d425e2 c58e2be2

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

+5 −6
Original line number Diff line number Diff line
@@ -77,14 +77,13 @@ public class FallbackTaskbarUIController extends TaskbarUIController { 


    /**

     * Creates an animation to animate the taskbar for the given state (but does not start it).

     * Currently this animation just force stashes the taskbar in Overview.

     */

    public Animator createAnimToRecentsState(RecentsState toState, long duration) {

        // Force stash the taskbar in overview modal state or when going home.

        boolean useStashedLauncherState =

                toState.hasOverviewActions() || toState == RecentsState.HOME;

        boolean stashedLauncherState = useStashedLauncherState && (

                (FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get() && toState == RecentsState.MODAL_TASK)

                        || toState == RecentsState.HOME);

        boolean useStashedLauncherState = toState.hasOverviewActions();

        boolean stashedLauncherState =

                useStashedLauncherState && FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW.get()

                        && toState == RecentsState.MODAL_TASK;

        TaskbarStashController stashController = mControllers.taskbarStashController;

        // Set both FLAG_IN_STASHED_LAUNCHER_STATE and FLAG_IN_APP to ensure the state is respected.

        // For all other states, just use the current stashed-in-app setting (e.g. if long clicked).