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

Commit bab97ee1 authored by Anushree Ganjam's avatar Anushree Ganjam Committed by Android (Google) Code Review
Browse files

Merge "Enable the CUSTOM_LPNH_THRESHOLDS flag." into main

parents 88b04e12 f1b8e4e1

src/com/android/launcher3/LauncherPrefs.kt

+1 −2
Original line number Diff line number Diff line
@@ -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

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

+2 −4
Original line number Diff line number Diff line
@@ -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(