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

Commit 7382883e authored by Federico Baron's avatar Federico Baron Committed by Android (Google) Code Review
Browse files

Merge changes If1a00ac6,I5b233070 into tm-qpr-dev 

* changes:
  Hide QSB (toast) when editing workspace
  Add flag for moving the workspace edit buttons to bottom
parents f834cfe9 98db0df4

src/com/android/launcher3/WorkspaceStateTransitionAnimation.java

+13 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2; 
import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.anim.Interpolators.ZOOM_OUT;

import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;

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

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

import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;

import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;
@@ -171,6 +172,18 @@ public class WorkspaceStateTransitionAnimation { 
            });

        }



        if (HOME_GARDENING_WORKSPACE_BUTTONS.get()) {

            propertySetter.setViewAlpha(

                    mLauncher.getHotseat().getQsb(),

                    state == SPRING_LOADED ? 0 : 1,

                    workspaceFadeInterpolator);

            propertySetter.addEndListener(success -> {

                if (success) {

                    mLauncher.getHotseat().getQsb().setClickable(state != SPRING_LOADED);

                }

            });

        }



        // Update the accessibility flags for hotseat based on launcher state.

        hotseat.setImportantForAccessibility(

                state.hasFlag(FLAG_HOTSEAT_INACCESSIBLE)

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

+5 −1
Original line number Diff line number Diff line
@@ -292,10 +292,14 @@ public final class FeatureFlags { 
    public static final BooleanFlag POPUP_MATERIAL_U = new DeviceFlag(

            "POPUP_MATERIAL_U", false, "Switch popup UX to use material U");



    public static final BooleanFlag SHOW_HOME_GARDENING = new DeviceFlag(

    public static final BooleanFlag SHOW_HOME_GARDENING = getDebugFlag(

            "SHOW_HOME_GARDENING", false,

            "Show the new home gardening mode");



    public static final BooleanFlag HOME_GARDENING_WORKSPACE_BUTTONS = getDebugFlag(

            "HOME_GARDENING_WORKSPACE_BUTTONS", false,

            "Change workspace edit buttons to reflect home gardening");



    public static final BooleanFlag ENABLE_TRANSIENT_TASKBAR = getDebugFlag(

            "ENABLE_TRANSIENT_TASKBAR", false, "Enables transient taskbar.");