From f1b8e4e155eb5ae10fe89fd4b19a91e55874ee1a Mon Sep 17 00:00:00 2001 From: Anushree Ganjam Date: Fri, 29 Mar 2024 12:29:32 -0700 Subject: [PATCH] Enable the CUSTOM_LPNH_THRESHOLDS flag. Decision by PM: Set the default LPNH_TIMEOUT_MS to 450ms. Bug: 311355495 Test: Manual Flag: legacy CUSTOM_LPNH_THRESHOLDS ENABLED Change-Id: I07f075a7c73e8038a83b19cdc1091c0c8735f869 --- src/com/android/launcher3/LauncherPrefs.kt | 3 +-- src/com/android/launcher3/config/FeatureFlags.java | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/com/android/launcher3/LauncherPrefs.kt b/src/com/android/launcher3/LauncherPrefs.kt index 27e084c715..cb19b143a4 100644 --- a/src/com/android/launcher3/LauncherPrefs.kt +++ b/src/com/android/launcher3/LauncherPrefs.kt @@ -20,7 +20,6 @@ import android.content.Context.MODE_PRIVATE import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.util.Log -import android.view.ViewConfiguration import androidx.annotation.VisibleForTesting import com.android.launcher3.BuildConfig.WIDGET_ON_FIRST_SCREEN import com.android.launcher3.LauncherFiles.DEVICE_PREFERENCES_KEY @@ -319,7 +318,7 @@ class LauncherPrefs(private val encryptedContext: Context) { val LONG_PRESS_NAV_HANDLE_TIMEOUT_MS = nonRestorableItem( "LPNH_TIMEOUT_MS", - ViewConfiguration.getLongPressTimeout(), + 450, EncryptionType.MOVE_TO_DEVICE_PROTECTED ) @JvmField diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 6d64c22547..bda175386e 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -33,7 +33,6 @@ import static com.android.launcher3.uioverrides.flags.FlagsFactory.getReleaseFla import static com.android.wm.shell.Flags.enableTaskbarNavbarUnification; import android.content.res.Resources; -import android.view.ViewConfiguration; import androidx.annotation.VisibleForTesting; @@ -132,7 +131,7 @@ public final class FeatureFlags { "Allow entering All Apps from Overview (e.g. long swipe up from app)"); public static final BooleanFlag CUSTOM_LPNH_THRESHOLDS = - getReleaseFlag(301680992, "CUSTOM_LPNH_THRESHOLDS", DISABLED, + getReleaseFlag(301680992, "CUSTOM_LPNH_THRESHOLDS", ENABLED, "Add dev options to customize the LPNH trigger slop and milliseconds"); public static final BooleanFlag ANIMATE_LPNH = @@ -155,8 +154,7 @@ public final class FeatureFlags { LONG_PRESS_NAV_HANDLE_EXTRA_TOUCH_WIDTH_DP); public static final IntFlag LPNH_TIMEOUT_MS = - FlagsFactory.getIntFlag(301680992, "LPNH_TIMEOUT_MS", - ViewConfiguration.getLongPressTimeout(), + FlagsFactory.getIntFlag(301680992, "LPNH_TIMEOUT_MS", 450, "Controls lpnh timeout in milliseconds", LONG_PRESS_NAV_HANDLE_TIMEOUT_MS); public static final BooleanFlag ENABLE_SHOW_KEYBOARD_OPTION_IN_ALL_APPS = getReleaseFlag(