Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Tap Gesture for Aware Settings" into qt-qpr1-dev

Browse Source 
am: e39c7bd211

Change-Id: I9f640b4c496297084934cb8036e011e675077f0c
This commit is contained in:
Edgar Wang
2019-11-04 20:13:27 -08:00
committed by android-build-merger
parent 55c51a846a e39c7bd211
commit 003ee4342d
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Settings.java
View File

@@ -8961,6 +8961,14 @@ public final class Settings {
private static final Validator AWARE_LOCK_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR; private static final Validator AWARE_LOCK_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;
/**
* Controls whether tap gesture is enabled.
* @hide
*/
public static final String TAP_GESTURE = "tap_gesture";
private static final Validator TAP_GESTURE_VALIDATOR = BOOLEAN_VALIDATOR;
/** /**
* This are the settings to be backed up. * This are the settings to be backed up.
* *
@@ -9294,6 +9302,7 @@ public final class Settings {
VALIDATORS.put(AWARE_LOCK_ENABLED, AWARE_LOCK_ENABLED_VALIDATOR); VALIDATORS.put(AWARE_LOCK_ENABLED, AWARE_LOCK_ENABLED_VALIDATOR);
VALIDATORS.put(AWARE_TAP_PAUSE_GESTURE_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR); VALIDATORS.put(AWARE_TAP_PAUSE_GESTURE_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);
VALIDATORS.put(AWARE_TAP_PAUSE_TOUCH_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR); VALIDATORS.put(AWARE_TAP_PAUSE_TOUCH_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);
VALIDATORS.put(TAP_GESTURE, TAP_GESTURE_VALIDATOR);
} }
/** /**

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -731,6 +731,7 @@ public class SettingsBackupTest {
Settings.Secure.SILENCE_GESTURE, Settings.Secure.SILENCE_GESTURE,
Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE, Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,
Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE, Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,
Settings.Secure.TAP_GESTURE,
Settings.Secure.FACE_UNLOCK_RE_ENROLL); Settings.Secure.FACE_UNLOCK_RE_ENROLL);
@Test @Test