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

Commit 90bd12ce authored Feb 04, 2022 by Haik Kalantarian Committed by Android (Google) Code Review Feb 04, 2022

Merge "Added Cooldown Mode global"

parents 4c0e85a2 ee64ba58

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -17321,6 +17321,12 @@ public final class Settings {
		public static final String CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED =
		"clockwork_long_press_to_assistant_enabled";

		/*
		* Whether the device has Cooldown Mode enabled.
		* @hide
		*/
		public static final String COOLDOWN_MODE_ON = "cooldown_mode_on";

		/*
		* Whether the device has Wet Mode/ Touch Lock Mode enabled.
		* @hide

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,7 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(Global.USER_PREFERRED_RESOLUTION_HEIGHT, ANY_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.USER_PREFERRED_RESOLUTION_WIDTH, ANY_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.Wearable.WET_MODE_ON, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.COOLDOWN_MODE_ON, BOOLEAN_VALIDATOR);
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -659,7 +659,8 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY,
		Settings.Global.Wearable.CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED,
		Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER,
		Settings.Global.Wearable.WET_MODE_ON);
		Settings.Global.Wearable.WET_MODE_ON,
		Settings.Global.Wearable.COOLDOWN_MODE_ON);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(