Merge "Change feature flag to device config flag." into udc-qpr-dev
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index fb552d7..1a97ca9 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -30,6 +30,4 @@
public static final String CONTEXTUAL_HOME = "settings_contextual_home";
public static final String SETTINGS_SEARCH_ALWAYS_EXPAND =
"settings_search_always_expand";
- public static final String PRESS_HOLD_NAV_HANDLE_TO_SEARCH =
- "settings_press_hold_nav_handle_to_search";
}
diff --git a/src/com/android/settings/core/SettingsUIDeviceConfig.java b/src/com/android/settings/core/SettingsUIDeviceConfig.java
index 4d96385..2401ff5 100644
--- a/src/com/android/settings/core/SettingsUIDeviceConfig.java
+++ b/src/com/android/settings/core/SettingsUIDeviceConfig.java
@@ -48,6 +48,11 @@
public static final String BT_LE_AUDIO_DEVICE_DETAIL_ENABLED =
"bt_le_audio_device_detail_enabled";
/**
+ * {@code true} if press and hold nav handle to search is enabled.
+ */
+ public static final String PRESS_HOLD_NAV_HANDLE_TO_SEARCH =
+ "press_hold_nav_handle_to_search";
+ /**
* {@code true} if long press home button to search is enabled.
*/
public static final String LONG_PRESS_HOME_BUTTON_TO_SEARCH =