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

Commit 18551f29 authored by Tony Wickham's avatar Tony Wickham
Browse files

Remove ENABLE_TRANSIENT_TASKBAR and long-press stash support 

Flag: NA
Test: manual, TaplTestsTaskbar, TaplTestsPersistent, TaplTestsTransient
Fixes: 270395798
Change-Id: I4ecf5ddcd1206e846538175c684043c5e065fd5d
parent 01563248

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

+2 −35
Original line number Diff line number Diff line
@@ -1141,15 +1141,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        return mControllers.taskbarStashController.isStashed();

    }



    /**

     * Called when we detect a long press in the nav region before passing the gesture slop.

     *

     * @return Whether taskbar handled the long press, and thus should cancel the gesture.

     */

    public boolean onLongPressToUnstashTaskbar() {

        return mControllers.taskbarStashController.onLongPressToUnstashTaskbar();

    }



    /**

     * Called when we want to unstash taskbar when user performs swipes up gesture.

     */
@@ -1205,28 +1196,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
     * @param animateForward Whether to animate towards the unstashed hint state or back to stashed.

     */

    public void startTaskbarUnstashHint(boolean animateForward) {

        // TODO(b/270395798): Clean up forceUnstash after removing long-press unstashing code.

        startTaskbarUnstashHint(animateForward, /* forceUnstash = */ false);

    }



    /**

     * Called when we detect a motion down or up/cancel in the nav region while stashed.

     *

     * @param animateForward Whether to animate towards the unstashed hint state or back to stashed.

     * @param forceUnstash   Whether we force the unstash hint.

     */

    public void startTaskbarUnstashHint(boolean animateForward, boolean forceUnstash) {

        // TODO(b/270395798): Clean up forceUnstash after removing long-press unstashing code.

        mControllers.taskbarStashController.startUnstashHint(animateForward, forceUnstash);

    }



    /**

     * Enables manual taskbar stashing. This method should only be used for tests that need to

     * stash/unstash the taskbar.

     */

    @VisibleForTesting

    public void enableManualStashingDuringTests(boolean enableManualStashing) {

        mControllers.taskbarStashController.enableManualStashingDuringTests(enableManualStashing);

        mControllers.taskbarStashController.startUnstashHint(animateForward);

    }



    /**
@@ -1239,15 +1209,12 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
    }



    /**

     * Unstashes the Taskbar if it is stashed. This method should only be used to unstash the

     * taskbar at the end of a test.

     * Unstashes the Taskbar if it is stashed.

     */

    @VisibleForTesting

    public void unstashTaskbarIfStashed() {

        if (DisplayController.isTransientTaskbar(this)) {

            mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(false);

        } else {

            mControllers.taskbarStashController.onLongPressToUnstashTaskbar();

        }

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -158,8 +158,7 @@ public class TaskbarForceVisibleImmersiveController implements TouchController { 


    @Override

    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {

        if (!isNavbarShownInImmersiveMode()

                || mControllers.taskbarStashController.supportsManualStashing()) {

        if (!isNavbarShownInImmersiveMode()) {

            return false;

        }

        return onControllerTouchEvent(ev);

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

+16 −146
Original line number Diff line number Diff line
@@ -15,17 +15,12 @@ 
 */

package com.android.launcher3.taskbar;



import static android.view.HapticFeedbackConstants.LONG_PRESS;

import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_CONTROLS;



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

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

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

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

import static com.android.launcher3.LauncherPrefs.TASKBAR_PINNING;

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

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_HIDE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_SHOW;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TRANSIENT_TASKBAR_HIDE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TRANSIENT_TASKBAR_SHOW;

import static com.android.launcher3.taskbar.TaskbarKeyguardController.MASK_ANY_SYSUI_LOCKED;
@@ -44,7 +39,6 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.app.RemoteAction;

import android.content.SharedPreferences;

import android.graphics.drawable.Icon;

import android.os.SystemClock;

import android.util.Log;
@@ -62,9 +56,7 @@ import androidx.annotation.VisibleForTesting; 
import com.android.internal.jank.InteractionJankMonitor;

import com.android.launcher3.Alarm;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.LauncherPrefs;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimatedFloat;

import com.android.launcher3.anim.AnimatorListeners;

import com.android.launcher3.util.DisplayController;
@@ -86,27 +78,26 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
    private static final boolean DEBUG = false;



    public static final int FLAG_IN_APP = 1 << 0;

    public static final int FLAG_STASHED_IN_APP_MANUAL = 1 << 1; // long press, persisted

    public static final int FLAG_STASHED_IN_APP_SYSUI = 1 << 2; // shade open, ...

    public static final int FLAG_STASHED_IN_APP_SETUP = 1 << 3; // setup wizard and AllSetActivity

    public static final int FLAG_STASHED_IN_APP_IME = 1 << 4; // IME is visible

    public static final int FLAG_IN_STASHED_LAUNCHER_STATE = 1 << 5;

    public static final int FLAG_STASHED_IN_TASKBAR_ALL_APPS = 1 << 6; // All apps is visible.

    public static final int FLAG_IN_SETUP = 1 << 7; // In the Setup Wizard

    public static final int FLAG_STASHED_SMALL_SCREEN = 1 << 8; // phone screen gesture nav, stashed

    public static final int FLAG_STASHED_IN_APP_AUTO = 1 << 9; // Autohide (transient taskbar).

    public static final int FLAG_STASHED_SYSUI = 1 << 10; //  app pinning,...

    public static final int FLAG_STASHED_DEVICE_LOCKED = 1 << 11; // device is locked: keyguard, ...

    public static final int FLAG_IN_OVERVIEW = 1 << 12; // launcher is in overview

    public static final int FLAG_STASHED_IN_APP_SYSUI = 1 << 1; // shade open, ...

    public static final int FLAG_STASHED_IN_APP_SETUP = 1 << 2; // setup wizard and AllSetActivity

    public static final int FLAG_STASHED_IN_APP_IME = 1 << 3; // IME is visible

    public static final int FLAG_IN_STASHED_LAUNCHER_STATE = 1 << 4;

    public static final int FLAG_STASHED_IN_TASKBAR_ALL_APPS = 1 << 5; // All apps is visible.

    public static final int FLAG_IN_SETUP = 1 << 6; // In the Setup Wizard

    public static final int FLAG_STASHED_SMALL_SCREEN = 1 << 7; // phone screen gesture nav, stashed

    public static final int FLAG_STASHED_IN_APP_AUTO = 1 << 8; // Autohide (transient taskbar).

    public static final int FLAG_STASHED_SYSUI = 1 << 9; //  app pinning,...

    public static final int FLAG_STASHED_DEVICE_LOCKED = 1 << 10; // device is locked: keyguard, ...

    public static final int FLAG_IN_OVERVIEW = 1 << 11; // launcher is in overview



    // If any of these flags are enabled, isInApp should return true.

    private static final int FLAGS_IN_APP = FLAG_IN_APP | FLAG_IN_SETUP;



    // If we're in an app and any of these flags are enabled, taskbar should be stashed.

    private static final int FLAGS_STASHED_IN_APP = FLAG_STASHED_IN_APP_MANUAL

            | FLAG_STASHED_IN_APP_SYSUI | FLAG_STASHED_IN_APP_SETUP

            | FLAG_STASHED_IN_APP_IME | FLAG_STASHED_IN_TASKBAR_ALL_APPS

            | FLAG_STASHED_SMALL_SCREEN | FLAG_STASHED_IN_APP_AUTO;

    private static final int FLAGS_STASHED_IN_APP =  FLAG_STASHED_IN_APP_SYSUI

            | FLAG_STASHED_IN_APP_SETUP | FLAG_STASHED_IN_APP_IME

            | FLAG_STASHED_IN_TASKBAR_ALL_APPS | FLAG_STASHED_SMALL_SCREEN

            | FLAG_STASHED_IN_APP_AUTO;



    // If any of these flags are enabled, inset apps by our stashed height instead of our unstashed

    // height. This way the reported insets are consistent even during transitions out of the app.
@@ -166,21 +157,11 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
     */

    private static final long TASKBAR_STASH_ICON_ALPHA_HOME_TO_APP_START_DELAY = 66;



    /**

     * The scale that TaskbarView animates to when hinting towards the stashed state.

     */

    private static final float STASHED_TASKBAR_HINT_SCALE = 0.9f;



    /**

     * The scale that the stashed handle animates to when hinting towards the unstashed state.

     */

    private static final float UNSTASHED_TASKBAR_HANDLE_HINT_SCALE = 1.1f;



    /**

     * The SharedPreferences key for whether user has manually stashed the taskbar.

     */

    private static final String SHARED_PREFS_STASHED_KEY = "taskbar_is_stashed";



    /**

     * Whether taskbar should be stashed out of the box.

     */
@@ -224,7 +205,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
    private @interface StashAnimation {}



    private final TaskbarActivityContext mActivity;

    private final SharedPreferences mPrefs;

    private final int mStashedHeight;

    private final int mUnstashedHeight;

    private final SystemUiProxy mSystemUiProxy;
@@ -253,8 +233,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
    private boolean mIsImeShowing;

    private boolean mIsImeSwitcherShowing;



    private boolean mEnableManualStashingDuringTests = false;



    private final Alarm mTimeoutAlarm = new Alarm();

    private boolean mEnableBlockingTimeoutDuringTests = false;
@@ -274,7 +252,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 


    public TaskbarStashController(TaskbarActivityContext activity) {

        mActivity = activity;

        mPrefs = LauncherPrefs.getPrefs(mActivity);

        mSystemUiProxy = SystemUiProxy.INSTANCE.get(activity);

        mAccessibilityManager = mActivity.getSystemService(AccessibilityManager.class);
@@ -328,15 +305,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        mTaskbarStashedHandleHintScale = stashedHandleController.getStashedHandleHintScale();



        boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivity);

        // We use supportsVisualStashing() here instead of supportsManualStashing() because we want

        // it to work properly for tests that recreate taskbar. This check is here just to ensure

        // that taskbar unstashes when going to 3 button mode (supportsVisualStashing() false).

        boolean isManuallyStashedInApp = supportsVisualStashing()

                && !isTransientTaskbar

                && !enableTaskbarPinning()

                && mPrefs.getBoolean(SHARED_PREFS_STASHED_KEY, DEFAULT_STASHED_PREF);

        boolean isInSetup = !mActivity.isUserSetupComplete() || setupUIVisible;

        updateStateForFlag(FLAG_STASHED_IN_APP_MANUAL, isManuallyStashedInApp);

        updateStateForFlag(FLAG_STASHED_IN_APP_AUTO,

                isTransientTaskbar && !mTaskbarSharedState.taskbarWasPinned);

        updateStateForFlag(FLAG_STASHED_IN_APP_SETUP, isInSetup);
@@ -361,28 +330,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        return !mActivity.isThreeButtonNav() && mControllers.uiController.supportsVisualStashing();

    }



    /**

     * Returns whether the user can manually stash the taskbar based on the current device state.

     */

    protected boolean supportsManualStashing() {

        if (enableTaskbarPinning() && LauncherPrefs.get(mActivity).get(TASKBAR_PINNING)) {

            return false;

        }

        return supportsVisualStashing()

                && isInApp()

                && (!Utilities.isRunningInTestHarness() || mEnableManualStashingDuringTests)

                && !DisplayController.isTransientTaskbar(mActivity);

    }



    /**

     * Enables support for manual stashing. This should only be used to add this functionality

     * to Launcher specific tests.

     */

    @VisibleForTesting

    public void enableManualStashingDuringTests(boolean enableManualStashing) {

        mEnableManualStashingDuringTests = enableManualStashing;

    }



    /**

     * Enables the auto timeout for taskbar stashing. This method should only be used for taskbar

     * testing.
@@ -577,53 +524,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
                /* shouldBubblesFollow= */ !bubbleBarExpanded);

    }



    /**

     * Should be called when long pressing the nav region when taskbar is present.

     * @return Whether taskbar was stashed and now is unstashed.

     */

    public boolean onLongPressToUnstashTaskbar() {

        if (!isStashed()) {

            // We only listen for long press on the nav region to unstash the taskbar. To stash the

            // taskbar, we use an OnLongClickListener on TaskbarView instead.

            return false;

        }

        if (!canCurrentlyManuallyUnstash()) {

            return false;

        }

        if (updateAndAnimateIsManuallyStashedInApp(false)) {

            mControllers.taskbarActivityContext.getDragLayer().performHapticFeedback(LONG_PRESS);

            return true;

        }

        return false;

    }



    /**

     * Returns whether taskbar will unstash when long pressing it based on the current state. The

     * only time this is true is if the user is in an app and the taskbar is only stashed because

     * the user previously long pressed to manually stash (not due to other reasons like IME).

     */

    private boolean canCurrentlyManuallyUnstash() {

        return (mState & (FLAG_IN_APP | FLAGS_STASHED_IN_APP))

                == (FLAG_IN_APP | FLAG_STASHED_IN_APP_MANUAL);

    }



    /**

     * Updates whether we should stash the taskbar when in apps, and animates to the changed state.

     * @return Whether we started an animation to either be newly stashed or unstashed.

     */

    public boolean updateAndAnimateIsManuallyStashedInApp(boolean isManuallyStashedInApp) {

        if (!supportsManualStashing()) {

            return false;

        }

        if (hasAnyFlag(FLAG_STASHED_IN_APP_MANUAL) != isManuallyStashedInApp) {

            mPrefs.edit().putBoolean(SHARED_PREFS_STASHED_KEY, isManuallyStashedInApp).apply();

            updateStateForFlag(FLAG_STASHED_IN_APP_MANUAL, isManuallyStashedInApp);

            applyState();

            return true;

        }

        return false;

    }



    /** Toggles the Taskbar's stash state. */

    public void toggleTaskbarStash() {

        if (!DisplayController.isTransientTaskbar(mActivity) || !hasAnyFlag(FLAGS_IN_APP)) return;
@@ -910,21 +810,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
            }

        });

    }

    /**

     * Creates and starts a partial stash animation, hinting at the new state that will trigger when

     * long press is detected.

     * @param animateForward Whether we are going towards the new stashed state or returning to the

     *                       unstashed state.

     */

    public void startStashHint(boolean animateForward) {

        if (isStashed() || !supportsManualStashing()) {

            // Already stashed, no need to hint in that direction.

            return;

        }

        mIconScaleForStash.animateToValue(

                animateForward ? STASHED_TASKBAR_HINT_SCALE : 1)

                .setDuration(TASKBAR_HINT_STASH_DURATION).start();

    }



    /**

     * Creates and starts a partial unstash animation, hinting at the new state that will trigger
@@ -932,19 +817,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
     *

     * @param animateForward Whether we are going towards the new unstashed state or returning to

     *                       the stashed state.

     * @param forceUnstash Whether we force the unstash hint to animate.

     */

    protected void startUnstashHint(boolean animateForward, boolean forceUnstash) {

    protected void startUnstashHint(boolean animateForward) {

        if (!isStashed()) {

            // Already unstashed, no need to hint in that direction.

            return;

        }

        // TODO(b/270395798): Clean up after removing long-press unstashing code path.

        if (!canCurrentlyManuallyUnstash() && !forceUnstash) {

            // If any other flags are causing us to be stashed, long press won't cause us to

            // unstash, so don't hint that it will.

            return;

        }

        mTaskbarStashedHandleHintScale.animateToValue(

                animateForward ? UNSTASHED_TASKBAR_HANDLE_HINT_SCALE : 1)

                .setDuration(TASKBAR_HINT_STASH_DURATION).start();
@@ -1097,13 +975,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
            mControllers.taskbarAutohideSuspendController.updateFlag(

                    TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_IN_LAUNCHER, !isInApp());

        }

        if (hasAnyFlag(changedFlags, FLAG_STASHED_IN_APP_MANUAL)) {

            if (hasAnyFlag(FLAG_STASHED_IN_APP_MANUAL)) {

                mActivity.getStatsLogManager().logger().log(LAUNCHER_TASKBAR_LONGPRESS_HIDE);

            } else {

                mActivity.getStatsLogManager().logger().log(LAUNCHER_TASKBAR_LONGPRESS_SHOW);

            }

        }

        if (hasAnyFlag(changedFlags, FLAG_STASHED_IN_APP_AUTO)) {

            mActivity.getStatsLogManager().logger().log(hasAnyFlag(FLAG_STASHED_IN_APP_AUTO)

                    ? LAUNCHER_TRANSIENT_TASKBAR_HIDE
@@ -1227,7 +1098,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
    private static String getStateString(int flags) {

        StringJoiner sj = new StringJoiner("|");

        appendFlag(sj, flags, FLAGS_IN_APP, "FLAG_IN_APP");

        appendFlag(sj, flags, FLAG_STASHED_IN_APP_MANUAL, "FLAG_STASHED_IN_APP_MANUAL");

        appendFlag(sj, flags, FLAG_STASHED_IN_APP_SYSUI, "FLAG_STASHED_IN_APP_SYSUI");

        appendFlag(sj, flags, FLAG_STASHED_IN_APP_SETUP, "FLAG_STASHED_IN_APP_SETUP");

        appendFlag(sj, flags, FLAG_STASHED_IN_APP_IME, "FLAG_STASHED_IN_APP_IME");

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

+0 −20
Original line number Diff line number Diff line
@@ -261,8 +261,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
        mIconClickListener = mControllerCallbacks.getIconOnClickListener();

        mIconLongClickListener = mControllerCallbacks.getIconOnLongClickListener();



        setOnLongClickListener(mControllerCallbacks.getBackgroundOnLongClickListener());



        if (mAllAppsButton != null) {

            mAllAppsButton.setOnClickListener(mControllerCallbacks.getAllAppsButtonClickListener());

        }
@@ -513,24 +511,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
        }

    }



    @Override

    public boolean onTouchEvent(MotionEvent event) {

        if (mIconLayoutBounds.left <= event.getX() && event.getX() <= mIconLayoutBounds.right) {

            // Don't allow long pressing between icons, or above/below them.

            return true;

        }

        if (mControllerCallbacks.onTouchEvent(event)) {

            int oldAction = event.getAction();

            try {

                event.setAction(MotionEvent.ACTION_CANCEL);

                return super.onTouchEvent(event);

            } finally {

                event.setAction(oldAction);

            }

        }

        return super.onTouchEvent(event);

    }



    /**

     * Returns whether the given MotionEvent, *in screen coorindates*, is within any Taskbar item's

     * touch bounds.

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

+0 −42
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA; 
import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;

import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;

import static com.android.launcher3.Utilities.mapRange;

import static com.android.launcher3.Utilities.squaredHypot;

import static com.android.launcher3.anim.AnimatedFloat.VALUE;

import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;

import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION;
@@ -899,52 +898,11 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
            return mControllers.taskbarDragController::startDragOnLongClick;

        }



        public View.OnLongClickListener getBackgroundOnLongClickListener() {

            return view -> mControllers.taskbarStashController

                    .updateAndAnimateIsManuallyStashedInApp(true);

        }



        /** Gets the hover listener for the provided icon view. */

        public View.OnHoverListener getIconOnHoverListener(View icon) {

            return new TaskbarHoverToolTipController(mActivity, mTaskbarView, icon);

        }



        /**

         * Get the first chance to handle TaskbarView#onTouchEvent, and return whether we want to

         * consume the touch so TaskbarView treats it as an ACTION_CANCEL.

         * TODO(b/270395798): We can remove this entirely once we remove the Transient Taskbar flag.

         */

        public boolean onTouchEvent(MotionEvent motionEvent) {

            final float x = motionEvent.getRawX();

            final float y = motionEvent.getRawY();

            switch (motionEvent.getAction()) {

                case MotionEvent.ACTION_DOWN:

                    mDownX = x;

                    mDownY = y;

                    mControllers.taskbarStashController.startStashHint(/* animateForward = */ true);

                    mCanceledStashHint = false;

                    break;

                case MotionEvent.ACTION_MOVE:

                    if (!mCanceledStashHint

                            && squaredHypot(mDownX - x, mDownY - y) > mSquaredTouchSlop) {

                        mControllers.taskbarStashController.startStashHint(

                                /* animateForward= */ false);

                        mCanceledStashHint = true;

                        return true;

                    }

                    break;

                case MotionEvent.ACTION_UP:

                case MotionEvent.ACTION_CANCEL:

                    if (!mCanceledStashHint) {

                        mControllers.taskbarStashController.startStashHint(

                                /* animateForward= */ false);

                    }

                    break;

            }



            return false;

        }



        /**

         * Notifies launcher to update icon alignment.

         */