diff options
| author | John Spurlock <jspurlock@google.com> | 2015-05-06 22:49:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 22:49:05 +0000 |
| commit | c2ec334079375ac6a4337bd5b94e173534b51129 (patch) | |
| tree | 62ac7d32661dd5af0b3ce1d89ca6acc6f328c182 /core/java/android | |
| parent | 9a7db1a6f58a3efc37c7e761445617f22adb9d4e (diff) | |
| parent | 51a871d48a9f4d912b2c12c29bbddcc5ec175825 (diff) | |
| download | frameworks_base-c2ec334079375ac6a4337bd5b94e173534b51129.zip frameworks_base-c2ec334079375ac6a4337bd5b94e173534b51129.tar.gz frameworks_base-c2ec334079375ac6a4337bd5b94e173534b51129.tar.bz2 | |
Merge "Add setting to mute wireless charging sound." into mnc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 293cf6f..3518f83 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5951,6 +5951,12 @@ public final class Settings { "wireless_charging_started_sound"; /** + * Whether to play a sound for charging events. + * @hide + */ + public static final String CHARGING_SOUNDS_ENABLED = "charging_sounds_enabled"; + + /** * Whether we keep the device on while the device is plugged in. * Supported values are: * <ul> |