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

Commit 0333de88 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add handling for toggling keyboard stashing from the keyboard" into udc-dev am: f0c96721 

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



Change-Id: Ie492544c1774027998f031eae8f8aff83e5d0c00
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9950933 f0c96721

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

+6 −1
Original line number Diff line number Diff line
@@ -1000,11 +1000,16 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        mControllers.taskbarEduTooltipController.hide();

    }



    /** Returns {@code true} if taskbar All Apps is open. */

    /** Returns {@code true} if Taskbar All Apps is open. */

    public boolean isTaskbarAllAppsOpen() {

        return mControllers.taskbarAllAppsController.isOpen();

    }



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

    public void toggleTaskbarStash() {

        mControllers.taskbarStashController.toggleTaskbarStash();

    }



    /**

     * Called to start the taskbar translation spring to its settled translation (0).

     */

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

+1 −2
Original line number Diff line number Diff line
@@ -474,8 +474,7 @@ public class TaskbarLauncherStateController { 
                    public void onAnimationEnd(Animator animation) {

                        TaskbarStashController stashController =

                                mControllers.taskbarStashController;

                        stashController.updateAndAnimateTransientTaskbar(

                                /* stash */ true, /* duration */ 0);

                        stashController.updateAndAnimateTransientTaskbar(/* stash */ true);

                    }

                });

            } else {

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

+7 −8
Original line number Diff line number Diff line
@@ -500,17 +500,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        return mStashedHeight;

    }



    /**

     * Stash or unstashes the transient taskbar, using the default TASKBAR_STASH_DURATION.

     */

    public void updateAndAnimateTransientTaskbar(boolean stash) {

        updateAndAnimateTransientTaskbar(stash, TASKBAR_STASH_DURATION);

    }



    /**

     * Stash or unstashes the transient taskbar.

     */

    public void updateAndAnimateTransientTaskbar(boolean stash, long duration) {

    public void updateAndAnimateTransientTaskbar(boolean stash) {

        if (!DisplayController.isTransientTaskbar(mActivity)) {

            return;

        }
@@ -575,6 +568,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        return false;

    }



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

    public void toggleTaskbarStash() {

        if (!DisplayController.isTransientTaskbar(mActivity) || !hasAnyFlag(FLAGS_IN_APP)) return;

        updateAndAnimateTransientTaskbar(!hasAnyFlag(FLAG_STASHED_IN_APP_AUTO));

    }



    /**

     * Adds the Taskbar unstash to Hotseat animator to the animator set.

     *

quickstep/src/com/android/quickstep/TouchInteractionService.java

+10 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 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.config.FeatureFlags;

import com.android.launcher3.provider.RestoreDbTask;

import com.android.launcher3.statehandlers.DesktopVisibilityController;

import com.android.launcher3.statemanager.StatefulActivity;
@@ -206,7 +207,15 @@ public class TouchInteractionService extends Service 
        @BinderThread

        @Override

        public void onTaskbarToggled() {

            // To be implemented.

            if (!FeatureFlags.ENABLE_KEYBOARD_TASKBAR_TOGGLE.get()) return;

            MAIN_EXECUTOR.execute(() -> {

                TaskbarActivityContext activityContext =

                        mTaskbarManager.getCurrentActivityContext();



                if (activityContext != null) {

                    activityContext.toggleTaskbarStash();

                }

            });

        }



        @BinderThread

src/com/android/launcher3/config/FeatureFlags.java

+4 −0
Original line number Diff line number Diff line
@@ -392,6 +392,10 @@ public final class FeatureFlags { 
    public static final BooleanFlag ENABLE_KEYBOARD_QUICK_SWITCH = getDebugFlag(270396844,

            "ENABLE_KEYBOARD_QUICK_SWITCH", ENABLED, "Enables keyboard quick switching");



    public static final BooleanFlag ENABLE_KEYBOARD_TASKBAR_TOGGLE = getDebugFlag(281726846,

            "ENABLE_KEYBOARD_TASKBAR_TOGGLE", ENABLED,

            "Enables keyboard taskbar stash toggling");



    // TODO(Block 30): Clean up flags

    public static final BooleanFlag USE_SEARCH_REQUEST_TIMEOUT_OVERRIDES = getDebugFlag(270395010,

            "USE_SEARCH_REQUEST_TIMEOUT_OVERRIDES", DISABLED,