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

Commit c7ff9cc0 authored by Xin Li's avatar Xin Li
Browse files

Merge ab/AP4A.241205.013 into aosp-main-future 

Bug: 370570306
Merged-In: Ia507354f42959ce9d320114a313bfc533186b524
Change-Id: I2cf8baad00355252c5621766e1da472c87007f9d
parents 08137ade 712da2cf

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

+13 −6
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ package com.android.launcher3.taskbar; 


import static android.window.flags.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY;



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

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

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

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

import static com.android.launcher3.taskbar.TaskbarEduTooltipControllerKt.TOOLTIP_STEP_FEATURES;
@@ -32,7 +34,6 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Flags;

import com.android.launcher3.LauncherState;

import com.android.launcher3.QuickstepTransitionManager;

import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimatedFloat;

import com.android.launcher3.logging.InstanceId;
@@ -204,11 +205,17 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
                isVisible,

                fromInitOrDestroy,

                /* startAnimation= */ true,

                DisplayController.isTransientTaskbar(mLauncher)

                getTaskbarAnimationDuration(isVisible));

    }



    private int getTaskbarAnimationDuration(boolean isVisible) {

        if (isVisible && !mLauncher.getPredictiveBackToHomeInProgress()) {

            return getTaskbarToHomeDuration();

        } else {

            return DisplayController.isTransientTaskbar(mLauncher)

                    ? TRANSIENT_TASKBAR_TRANSITION_DURATION

                        : (!isVisible

                                ? QuickstepTransitionManager.TASKBAR_TO_APP_DURATION

                                : QuickstepTransitionManager.getTaskbarToHomeDuration()));

                    : TASKBAR_TO_APP_DURATION;

        }

    }



    @Nullable

quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas 
        }

        if (

            taskbarStashController.isInApp ||

                taskbarStashController.isInOverview ||

                controllers.uiController.isInOverviewUi ||

                DisplayController.showLockedTaskbarOnHome(context)

        ) {

            // only add the taskbar touch region if not on home

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

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



import static com.android.app.animation.Interpolators.EMPHASIZED;

import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation;

import static com.android.launcher3.Hotseat.ALPHA_CHANNEL_TASKBAR_ALIGNMENT;

import static com.android.launcher3.Hotseat.ALPHA_CHANNEL_TASKBAR_STASH;

import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
@@ -39,6 +40,7 @@ import android.animation.AnimatorSet; 
import android.animation.ObjectAnimator;

import android.os.SystemClock;

import android.util.Log;

import android.view.animation.Interpolator;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -58,6 +60,7 @@ import com.android.launcher3.util.DisplayController; 
import com.android.launcher3.util.MultiPropertyFactory.MultiProperty;

import com.android.quickstep.RecentsAnimationCallbacks;

import com.android.quickstep.RecentsAnimationController;

import com.android.quickstep.util.ScalingWorkspaceRevealAnim;

import com.android.quickstep.util.SystemUiFlagUtils;

import com.android.quickstep.views.RecentsView;

import com.android.systemui.animation.ViewRootSync;
@@ -666,7 +669,9 @@ public class TaskbarLauncherStateController { 
            animatorSet.play(iconAlignAnim);

        }



        animatorSet.setInterpolator(EMPHASIZED);

        Interpolator interpolator = enableScalingRevealHomeAnimation()

                ? ScalingWorkspaceRevealAnim.SCALE_INTERPOLATOR : EMPHASIZED;

        animatorSet.setInterpolator(interpolator);



        if (start) {

            animatorSet.start();

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

+4 −0
Original line number Diff line number Diff line
@@ -1300,6 +1300,10 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer, 
        mTISBindHelper.setPredictiveBackToHomeInProgress(isInProgress);

    }



    public boolean getPredictiveBackToHomeInProgress() {

        return mIsPredictiveBackToHomeInProgress;

    }



    @Override

    public boolean areDesktopTasksVisible() {

        DesktopVisibilityController desktopVisibilityController = getDesktopVisibilityController();

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+7 −1
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ public abstract class AbsSwipeUpHandler< 
            getNextStateFlag("STATE_SCALED_CONTROLLER_HOME");

    private static final int STATE_SCALED_CONTROLLER_RECENTS =

            getNextStateFlag("STATE_SCALED_CONTROLLER_RECENTS");

    private static final int STATE_PARALLEL_ANIM_FINISHED =

            getNextStateFlag("STATE_PARALLEL_ANIM_FINISHED");



    protected static final int STATE_HANDLER_INVALIDATED =

            getNextStateFlag("STATE_HANDLER_INVALIDATED");
@@ -450,7 +452,8 @@ public abstract class AbsSwipeUpHandler< 
        mStateCallback.runOnceAtState(STATE_SCREENSHOT_CAPTURED | STATE_GESTURE_COMPLETED

                        | STATE_SCALED_CONTROLLER_HOME,

                this::finishCurrentTransitionToHome);

        mStateCallback.runOnceAtState(STATE_SCALED_CONTROLLER_HOME | STATE_CURRENT_TASK_FINISHED,

        mStateCallback.runOnceAtState(STATE_SCALED_CONTROLLER_HOME | STATE_CURRENT_TASK_FINISHED

                        | STATE_PARALLEL_ANIM_FINISHED,

                this::reset);



        mStateCallback.runOnceAtState(STATE_LAUNCHER_PRESENT | STATE_APP_CONTROLLER_RECEIVED
@@ -1548,9 +1551,12 @@ public abstract class AbsSwipeUpHandler< 
                    @Override

                    public void onAnimationEnd(Animator animation) {

                        mParallelRunningAnim = null;

                        mStateCallback.setStateOnUiThread(STATE_PARALLEL_ANIM_FINISHED);

                    }

                });

                mParallelRunningAnim.start();

            } else {

                mStateCallback.setStateOnUiThread(STATE_PARALLEL_ANIM_FINISHED);

            }

        }