mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-01 16:26:47 +00:00
Merge changes If1a00ac6,I5b233070 into tm-qpr-dev am: 7382883ee6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20226238 Change-Id: I0e293bc03b98dbf0a8890cab75be84a3e3e8137f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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.");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user