commit 4b9a14cd8b565b4bd9876437478e24b00c801ccc
author Andreas Agvard <agvard@google.com> Sat Dec 02 08:55:57 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 02 08:55:57 2023 +0000
tree bf9f5a9c97f77144149cc4ffff67240def178e97
parent b70b7fde7a4361b22a35c1ddba93412047e3e370
parent 23de925836af971197b90f1f60e2f3b46ae1780b

Merge changes I9c92d3cb,I98e2dea9 into main

* changes:
  Increase slider for haptic hint iterations
  Enables ENABLE_SEARCH_HAPTIC_COMMIT

quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsUI.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsUI.java b/quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsUI.java
index 6671fc3..301fbe4 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsUI.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsUI.java
@@ -359,7 +359,7 @@
             category.addPreference(createSeekBarPreference("Haptic hint scale exponent",
                     1, 5, 1, LONG_PRESS_NAV_HANDLE_HAPTIC_HINT_SCALE_EXPONENT));
             category.addPreference(createSeekBarPreference("Haptic hint iterations (12 ms each)",
-                    0, 100, 1, LONG_PRESS_NAV_HANDLE_HAPTIC_HINT_ITERATIONS));
+                    0, 200, 1, LONG_PRESS_NAV_HANDLE_HAPTIC_HINT_ITERATIONS));
             category.addPreference(createSeekBarPreference("Haptic hint delay (ms)",
                     0, 400, 1, LONG_PRESS_NAV_HANDLE_HAPTIC_HINT_DELAY));
         }

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

diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index a2dcf96..bed6efb 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -291,7 +291,7 @@
                     "Enables haptic hint while long pressing on the bottom bar nav handle.");
 
     public static final BooleanFlag ENABLE_SEARCH_HAPTIC_COMMIT =
-            getReleaseFlag(314005577, "ENABLE_SEARCH_HAPTIC_COMMIT", DISABLED,
+            getReleaseFlag(314005577, "ENABLE_SEARCH_HAPTIC_COMMIT", ENABLED,
                     "Enables haptic hint at end of long pressing on the bottom bar nav handle.");
 
     public static final IntFlag LPNH_HAPTIC_HINT_START_SCALE_PERCENT =