summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-05-18 20:57:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-18 20:57:21 +0000
commitfedf04f3dfc1195d98bb928d30b47ac07b7f3a29 (patch)
treee3cd4a50b14e30c28e5396ca4175cd335af21e6f /core/java
parent664956a5a278beb714e61cfb4324653540e7b39d (diff)
parentdf9f36da19ab42bb1c44dc61a8300aecea0a840d (diff)
Merge "(Behind flag) Wireless charging vibration feedback" into pi-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 4038d0b70119..f801844b5e28 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -8610,6 +8610,14 @@ public final class Settings {
private static final Validator CHARGING_SOUNDS_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;
/**
+ * Whether to vibrate for wireless charging events.
+ * @hide
+ */
+ public static final String CHARGING_VIBRATION_ENABLED = "charging_vibration_enabled";
+
+ private static final Validator CHARGING_VIBRATION_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;
+
+ /**
* Whether we keep the device on while the device is plugged in.
* Supported values are:
* <ul>
@@ -12028,6 +12036,7 @@ public final class Settings {
PRIVATE_DNS_SPECIFIER,
SOFT_AP_TIMEOUT_ENABLED,
ZEN_DURATION,
+ CHARGING_VIBRATION_ENABLED,
};
/**
@@ -12071,6 +12080,7 @@ public final class Settings {
WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR);
VALIDATORS.put(APP_AUTO_RESTRICTION_ENABLED, APP_AUTO_RESTRICTION_ENABLED_VALIDATOR);
VALIDATORS.put(ZEN_DURATION, ZEN_DURATION_VALIDATOR);
+ VALIDATORS.put(CHARGING_VIBRATION_ENABLED, CHARGING_VIBRATION_ENABLED_VALIDATOR);
}
/**