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

Merge "Add motion sense tap gesture + touch counts" into qt-qpr1-dev

Browse Source
This commit is contained in:
Beverly Tai
2019-10-23 18:03:12 +00:00
committed by Android (Google) Code Review
parent 4ede0d9f33 1742455882
commit cafc138898
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7854,6 +7854,19 @@ public final class Settings {
private static final Validator SILENCE_GESTURE_COUNT_VALIDATOR =
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
@@ -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);
}
/**

5
core/proto/android/providers/settings/secure.proto
View File

@@ -211,6 +211,11 @@ message SecureSettingsProto {
optional SettingProto silence_timer_touch_count = 11 [ (android.privacy).dest =
DEST_AUTOMATIC ];
optional SettingProto skip_touch_count = 12 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto aware_tap_pause_gesture_count = 13 [
(android.privacy).dest =
DEST_AUTOMATIC ];
optional SettingProto aware_tap_pause_touch_count = 14 [ (android.privacy).dest =
DEST_AUTOMATIC ];
}
optional Gesture gesture = 74;

6
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -1969,6 +1969,12 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p,
Settings.Secure.SKIP_TOUCH_COUNT,
SecureSettingsProto.Gesture.SKIP_TOUCH_COUNT);
dumpSetting(s, p,
Settings.Secure.AWARE_TAP_PAUSE_GESTURE_COUNT,
SecureSettingsProto.Gesture.AWARE_TAP_PAUSE_GESTURE_COUNT);
dumpSetting(s, p,
Settings.Secure.AWARE_TAP_PAUSE_TOUCH_COUNT,
SecureSettingsProto.Gesture.AWARE_TAP_PAUSE_TOUCH_COUNT);
p.end(gestureToken);
dumpSetting(s, p,