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

Commit 4b9a14cd authored by Andreas Agvard's avatar Andreas Agvard Committed by Android (Google) Code Review
Browse files

Merge changes I9c92d3cb,I98e2dea9 into main 

* changes:
  Increase slider for haptic hint iterations
  Enables ENABLE_SEARCH_HAPTIC_COMMIT
parents b70b7fde 23de9258

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

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ public class DeveloperOptionsUI { 
            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

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ public final class FeatureFlags { 
                    "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 =