Merge "Add assist gesture silence and wake settings" into oc-dr1-dev

This commit is contained in:
Kevin Chyn
2017-06-14 01:43:47 +00:00
committed by Android (Google) Code Review

View File

@@ -6802,6 +6802,22 @@ public final class Settings {
*/
public static final String ASSIST_GESTURE_SENSITIVITY = "assist_gesture_sensitivity";
/**
* Whether the assist gesture should silence alerts.
*
* @hide
*/
public static final String ASSIST_GESTURE_SILENCE_ALERTS_ENABLED =
"assist_gesture_silence_alerts_enabled";
/**
* Whether the assist gesture should wake the phone.
*
* @hide
*/
public static final String ASSIST_GESTURE_WAKE_ENABLED =
"assist_gesture_wake_enabled";
/**
* Whether Assist Gesture Deferred Setup has been completed
*
@@ -7096,6 +7112,9 @@ public final class Settings {
AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
ASSIST_GESTURE_ENABLED,
ASSIST_GESTURE_SENSITIVITY,
ASSIST_GESTURE_SETUP_COMPLETE,
ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,
ASSIST_GESTURE_WAKE_ENABLED,
VR_DISPLAY_MODE,
NOTIFICATION_BADGING
};