Merge "Adds search_all_entrypoints_enabled setting." into main (48f5af0c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+3 −12

Original line number	Diff line number	Diff line
		@@ -11090,21 +11090,12 @@ public final class Settings {
		"assist_long_press_home_enabled";

		/**
		* Whether press and hold on nav handle can trigger search.
		* Whether all entrypoints can trigger search. Replaces individual settings.
		*
		* @hide
		*/
		public static final String SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED =
		"search_press_hold_nav_handle_enabled";

		/**
		* Whether long-pressing on the home button can trigger search.
		*
		* @hide
		*/
		public static final String SEARCH_LONG_PRESS_HOME_ENABLED =
		"search_long_press_home_enabled";

		public static final String SEARCH_ALL_ENTRYPOINTS_ENABLED =
		"search_all_entrypoints_enabled";

		/**
		* Whether or not the accessibility data streaming is enbled for the

+4 −2

Original line number	Diff line number	Diff line
		@@ -143,9 +143,11 @@ message SecureSettingsProto {
		optional SettingProto gesture_setup_complete = 9 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto touch_gesture_enabled = 10 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto long_press_home_enabled = 11 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto search_press_hold_nav_handle_enabled = 12 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto search_long_press_home_enabled = 13 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Deprecated - use search_all_entrypoints_enabled instead
		optional SettingProto search_press_hold_nav_handle_enabled = 12 [ (android.privacy).dest = DEST_AUTOMATIC, deprecated = true ];
		optional SettingProto search_long_press_home_enabled = 13 [ (android.privacy).dest = DEST_AUTOMATIC, deprecated = true ];
		optional SettingProto visual_query_accessibility_detection_enabled = 14 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto search_all_entrypoints_enabled = 15 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Assist assist = 7;

+2 −4

Original line number	Diff line number	Diff line
		@@ -6419,10 +6419,8 @@
		<!-- Default value for Settings.ASSIST_TOUCH_GESTURE_ENABLED -->
		<bool name="config_assistTouchGestureEnabledDefault">true</bool>

		<!-- Default value for Settings.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED -->
		<bool name="config_searchPressHoldNavHandleEnabledDefault">true</bool>
		<!-- Default value for Settings.ASSIST_LONG_PRESS_HOME_ENABLED for search overlay -->
		<bool name="config_searchLongPressHomeEnabledDefault">true</bool>
		<!-- Default value for Settings.SEARCH_ALL_ENTRYPOINTS_ENABLED -->
		<bool name="config_searchAllEntrypointsEnabledDefault">true</bool>

		<!-- The maximum byte size of the information contained in the bundle of
		HotwordDetectedResult. -->

+1 −2

Original line number	Diff line number	Diff line
		@@ -5019,8 +5019,7 @@
		<java-symbol type="bool" name="config_assistLongPressHomeEnabledDefault" />
		<java-symbol type="bool" name="config_assistTouchGestureEnabledDefault" />

		<java-symbol type="bool" name="config_searchPressHoldNavHandleEnabledDefault" />
		<java-symbol type="bool" name="config_searchLongPressHomeEnabledDefault" />
		<java-symbol type="bool" name="config_searchAllEntrypointsEnabledDefault" />

		<java-symbol type="integer" name="config_hotwordDetectedResultMaxBundleSize" />

+1 −2

Original line number	Diff line number	Diff line
		@@ -256,8 +256,7 @@ public class SecureSettings {
		Settings.Secure.HEARING_AID_MEDIA_ROUTING,
		Settings.Secure.HEARING_AID_NOTIFICATION_ROUTING,
		Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,
		Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED,
		Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED,
		Settings.Secure.SEARCH_ALL_ENTRYPOINTS_ENABLED,
		Settings.Secure.HUB_MODE_TUTORIAL_STATE,
		Settings.Secure.STYLUS_BUTTONS_ENABLED,
		Settings.Secure.STYLUS_HANDWRITING_ENABLED,