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

Commit 93e5675d authored Sep 12, 2023 by Holly Jiuyu Sun Committed by Automerger Merge Worker Sep 12, 2023

Merge "Use separate Settings.Secure entry for the new LPH settings page." into...

Merge "Use separate Settings.Secure entry for the new LPH settings page." into udc-qpr-dev am: 80fd0acb

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

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

parents 0e09b437 80fd0acb

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -10504,6 +10504,14 @@ public final class Settings {
		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";

		/**
		* 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
		@@ -138,6 +138,7 @@ message SecureSettingsProto {
		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 ];
		}
		optional Assist assist = 7;

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

+2 −1

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

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.ASSIST_TOUCH_GESTURE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.ASSIST_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.SEARCH_LONG_PRESS_HOME_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.VR_DISPLAY_MODE, new DiscreteValueValidator(new String[] {"0", "1"}));
		VALIDATORS.put(Secure.NOTIFICATION_BADGING, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.NOTIFICATION_DISMISS_RTL, BOOLEAN_VALIDATOR);

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1929,6 +1929,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED,
		SecureSettingsProto.Assist.SEARCH_PRESS_HOLD_NAV_HANDLE_ENABLED);
		dumpSetting(s, p,
		Settings.Secure.SEARCH_LONG_PRESS_HOME_ENABLED,
		SecureSettingsProto.Assist.SEARCH_LONG_PRESS_HOME_ENABLED);
		p.end(assistToken);

		final long assistHandlesToken = p.start(SecureSettingsProto.ASSIST_HANDLES);