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

Commit 1253d56f authored Nov 13, 2020 by Josh Yang Committed by Yeabkal Assegid Wubshit Jul 23, 2021

Add gesture settings to system settings provider

Bug: 172168582
Test: manual tested
Change-Id: If8e6c588209d308d490368580310a4f589f1c08c
(cherry picked from commit 7eca5ecf22ac4a6c9234c130a61f75f540faec08)

parent d18c61ae

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -16694,6 +16694,18 @@ public final class Settings {
		* @hide
		*/
		public static final String OEM_SETUP_VERSION = "oem_setup_version";

		/**
		* Controls the gestures feature.
		* @hide
		*/
		public static final String MASTER_GESTURES_ENABLED = "master_gestures_enabled";

		/**
		* Whether or not ungaze is enabled.
		* @hide
		*/
		public static final String UNGAZE_ENABLED = "ungaze_enabled";
		}
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -292,6 +292,8 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(Global.Wearable.COMPANION_OS_VERSION, ANY_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.Wearable.ENABLE_ALL_LANGUAGES, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.OEM_SETUP_VERSION, ANY_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.Wearable.MASTER_GESTURES_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.UNGAZE_ENABLED, BOOLEAN_VALIDATOR);
		}
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -656,7 +656,9 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.COMPANION_OS_VERSION,
		Settings.Global.Wearable.ENABLE_ALL_LANGUAGES,
		Settings.Global.Wearable.SETUP_LOCALE,
		Settings.Global.Wearable.OEM_SETUP_VERSION);
		Settings.Global.Wearable.OEM_SETUP_VERSION,
		Settings.Global.Wearable.MASTER_GESTURES_ENABLED,
		Settings.Global.Wearable.UNGAZE_ENABLED);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(