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

Commit 94cc0ba9 authored Oct 30, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Oct 30, 2019

Merge "Add Tap Gesture for Aware Settings"

parents a677489b 32af83b2

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -8268,6 +8268,12 @@ public final class Settings {
		*/
		public static final String AWARE_LOCK_ENABLED = "aware_lock_enabled";

		/**
		* Controls whether tap gesture is enabled.
		* @hide
		*/
		public static final String TAP_GESTURE = "tap_gesture";

		/**
		* Keys we no longer back up under the current schema, but want to continue to
		* process when restoring historical backup datasets.

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -228,5 +228,6 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.GLOBAL_ACTIONS_PANEL_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.AWARE_LOCK_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.DISPLAY_DENSITY_FORCED, NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.TAP_GESTURE, BOOLEAN_VALIDATOR);
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -732,7 +732,8 @@ public class SettingsBackupTest {
		Settings.Secure.SILENCE_GESTURE,
		Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,
		Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,
		Settings.Secure.FACE_UNLOCK_RE_ENROLL);
		Settings.Secure.FACE_UNLOCK_RE_ENROLL,
		Settings.Secure.TAP_GESTURE);

		@Test
		public void systemSettingsBackedUpOrBlacklisted() {