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

Commit 052b4c92 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Update SUW swipe home logic for taskbar stashing" into main

parents bc549958 b297d4fb

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

+2 −1
Original line number Diff line number Diff line
@@ -1487,7 +1487,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
            ((LauncherTaskbarUIController) uiController).addLauncherVisibilityChangedAnimation(

                    fullAnimation, duration);

        }

        mControllers.taskbarStashController.addUnstashToHotseatAnimation(fullAnimation, duration);

        mControllers.taskbarStashController.addUnstashToHotseatAnimationFromSuw(fullAnimation,

                duration);



        View allAppsButton = mControllers.taskbarViewController.getAllAppsButtonView();

        if (allAppsButton != null && !FeatureFlags.ENABLE_ALL_APPS_BUTTON_IN_HOTSEAT.get()) {

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

+3 −3
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        boolean hideTaskbar = isVisible || !mActivity.isUserSetupComplete();

        updateStateForFlag(FLAG_IN_SETUP, hideTaskbar);

        updateStateForFlag(FLAG_STASHED_IN_APP_SETUP, hideTaskbar);

        updateStateForFlag(FLAG_STASHED_SMALL_SCREEN, mActivity.isPhoneGestureNavMode());

        applyState(hideTaskbar ? 0 : getStashDuration());

    }
@@ -547,11 +546,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
     *                            sub-animations are properly coordinated. This duration should not

     *                            actually be used since this animation tracks a swipe progress.

     */

    protected void addUnstashToHotseatAnimation(AnimatorSet animation, int placeholderDuration) {

    protected void addUnstashToHotseatAnimationFromSuw(AnimatorSet animation,

            int placeholderDuration) {

        // Defer any UI updates now to avoid the UI becoming stale when the animation plays.

        mControllers.taskbarViewController.setDeferUpdatesForSUW(true);

        createAnimToIsStashed(

                /* isStashed= */ false,

                /* isStashed= */ mActivity.isPhoneMode(),

                placeholderDuration,

                TRANSITION_UNSTASH_SUW_MANUAL,

                /* jankTag= */ "SUW_MANUAL");