summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2019-10-23 18:03:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-10-23 18:03:12 +0000
commitcafc1388989a679d48b361919b274409fcbb2a39 (patch)
tree141c527aeff67265628629b515585407f83db930 /core/java/android
parent4ede0d9f3328e622a899a4dd5f81abafe63e3d6d (diff)
parent1742455882436c9c4d15046c220044c03cddbdad (diff)
Merge "Add motion sense tap gesture + touch counts" into qt-qpr1-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java19
1 files changed, 18 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 27033abe4d01..b1672bbabaed 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7855,6 +7855,19 @@ public final class Settings {
NON_NEGATIVE_INTEGER_VALIDATOR;
/**
+ * Number of successful "Motion Sense" tap gestures to pause media.
+ * @hide
+ */
+ public static final String AWARE_TAP_PAUSE_GESTURE_COUNT = "aware_tap_pause_gesture_count";
+
+ /**
+ * Number of touch interactions to pause media when a "Motion Sense" gesture could
+ * have been used.
+ * @hide
+ */
+ public static final String AWARE_TAP_PAUSE_TOUCH_COUNT = "aware_tap_pause_touch_count";
+
+ /**
* The current night mode that has been selected by the user. Owned
* and controlled by UiModeManagerService. Constants are as per
* UiModeManager.
@@ -9082,7 +9095,9 @@ public final class Settings {
SILENCE_TIMER_TOUCH_COUNT,
DARK_MODE_DIALOG_SEEN,
GLOBAL_ACTIONS_PANEL_ENABLED,
- AWARE_LOCK_ENABLED
+ AWARE_LOCK_ENABLED,
+ AWARE_TAP_PAUSE_GESTURE_COUNT,
+ AWARE_TAP_PAUSE_TOUCH_COUNT
};
/**
@@ -9277,6 +9292,8 @@ public final class Settings {
VALIDATORS.put(UI_NIGHT_MODE, UI_NIGHT_MODE_VALIDATOR);
VALIDATORS.put(GLOBAL_ACTIONS_PANEL_ENABLED, GLOBAL_ACTIONS_PANEL_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_TOUCH_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);
}
/**