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

Commit 274c8330 authored Aug 17, 2023 by Holly Jiuyu Sun Committed by Automerger Merge Worker Aug 17, 2023

Merge "Update Gesture navigation page to support search." into udc-qpr-dev am:...

Merge "Update Gesture navigation page to support search." into udc-qpr-dev am: 3a68765b am: 4ff47124

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24373170

Change-Id: Idf63f1df1d1f934f631015b00449a99bf6323ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6df34144 4ff47124

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -10656,6 +10656,14 @@ public final class Settings {
		public static final String ASSIST_LONG_PRESS_HOME_ENABLED =
		"assist_long_press_home_enabled";

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

		/**
		* Control whether Trust Agents are in active unlock or extend unlock mode.
		* @hide

core/proto/android/providers/settings/secure.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,7 @@ 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 Assist assist = 7;

core/res/res/values/config.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -6172,6 +6172,9 @@
		<!-- 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>

		<!-- The maximum byte size of the information contained in the bundle of
		HotwordDetectedResult. -->
		<integer translatable="false" name="config_hotwordDetectedResultMaxBundleSize">0</integer>

core/res/res/values/symbols.xml

+2 −0

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

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

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

		<java-symbol type="dimen" name="config_wallpaperDimAmount" />

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -242,6 +242,7 @@ public class SecureSettings {
		Settings.Secure.HEARING_AID_CALL_ROUTING,
		Settings.Secure.HEARING_AID_MEDIA_ROUTING,
		Settings.Secure.HEARING_AID_SYSTEM_SOUNDS_ROUTING,
		Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED
		Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,
		Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED
		};
		}