From fa83199e62265b50ffec274b5ad1f6f0edce0b88 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Fri, 16 Sep 2022 16:39:02 +0800 Subject: [PATCH] Turn off changing depth in wallpaper picker Fix: 246845529 Bug: 240580498 Test: manual Change-Id: Ib8fd624c518fb4c26d2598137d056b196a0ddeb7 --- .../com/android/launcher3/uioverrides/QuickstepLauncher.java | 2 ++ src/com/android/launcher3/config/FeatureFlags.java | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 2307b5f6c2..feaac95d3e 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -586,6 +586,8 @@ public class QuickstepLauncher extends Launcher { public void onWidgetsTransition(float progress) { super.onWidgetsTransition(progress); onTaskbarInAppDisplayProgressUpdate(progress, WIDGETS_PAGE_PROGRESS_INDEX); + // Change of wallpaper depth in widget picker is disabled for tests as it causes flakiness + // on very slow cuttlefish devices. if (ENABLE_WIDGET_PICKER_DEPTH.get() && !Utilities.IS_RUNNING_IN_TEST_HARNESS) { WIDGET_DEPTH.set(getDepthController(), Utilities.mapToRange(progress, 0f, 1f, 0f, getDeviceProfile().bottomSheetDepth, diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 0e36dc0e60..ef6350ed54 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -289,10 +289,8 @@ public final class FeatureFlags { "Enable option to log the keyboard latency for both atomic and controlled keyboard " + "animations on an EditText"); - // Change of wallpaper depth in widget picker is disabled for tests as it causes flakiness on - // very slow cuttlefish devices. public static final BooleanFlag ENABLE_WIDGET_PICKER_DEPTH = new DeviceFlag( - "ENABLE_WIDGET_PICKER_DEPTH", true, "Enable changing depth in widget picker."); + "ENABLE_WIDGET_PICKER_DEPTH", false, "Enable changing depth in widget picker."); public static void initialize(Context context) { synchronized (sDebugFlags) {