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

Commit 07e487cb authored Feb 14, 2023 by Chen Bai Committed by Android (Google) Code Review Feb 14, 2023

Merge "chord: Add wear screenshot pref key"

parents e8733a81 35398067

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -18161,6 +18161,12 @@ public final class Settings {
		public static final String GESTURE_TOUCH_AND_HOLD_WATCH_FACE_ENABLED =
		"gesture_touch_and_hold_watchface_enabled";

		/**
		* Whether screenshot is enabled.
		* @hide
		*/
		public static final String SCREENSHOT_ENABLED = "screenshot_enabled";

		/**
		* Whether bedtime mode is enabled.
		* @hide

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -403,5 +403,6 @@ public class GlobalSettingsValidators {
		String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_ABORTED),
		}));
		VALIDATORS.put(Global.Wearable.DYNAMIC_COLOR_THEME_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.SCREENSHOT_ENABLED, BOOLEAN_VALIDATOR);
		}
		}

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -666,7 +666,8 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.LOCK_SCREEN_STATE,
		Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_ENABLED,
		Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_TYPE,
		Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_SPEED);
		Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_SPEED,
		Settings.Global.Wearable.SCREENSHOT_ENABLED);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(