summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/notification
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-05-06 17:42:30 -0400
committerJohn Spurlock <jspurlock@google.com>2015-05-06 17:42:30 -0400
commitae91c0a99a3e683ccd065e1dc8fc4f6b644174ec (patch)
tree61911c8dd18ad93443924b01eedb918bb543139b /src/com/android/settings/notification
parent0d2a8d204bb7d62834d51393a1d4a6ddaa7753f8 (diff)
downloadpackages_apps_Settings-ae91c0a99a3e683ccd065e1dc8fc4f6b644174ec.zip
packages_apps_Settings-ae91c0a99a3e683ccd065e1dc8fc4f6b644174ec.tar.gz
packages_apps_Settings-ae91c0a99a3e683ccd065e1dc8fc4f6b644174ec.tar.bz2
Settings: Add setting to mute wireless charging sound.
Bug: 19538553 Change-Id: I93228aee38f8eb035025409ce063f3050bf9bb9a
Diffstat (limited to 'src/com/android/settings/notification')
-rw-r--r--src/com/android/settings/notification/OtherSoundSettings.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java
index c226906..969ec90 100644
--- a/src/com/android/settings/notification/OtherSoundSettings.java
+++ b/src/com/android/settings/notification/OtherSoundSettings.java
@@ -60,6 +60,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In
private static final String KEY_DIAL_PAD_TONES = "dial_pad_tones";
private static final String KEY_SCREEN_LOCKING_SOUNDS = "screen_locking_sounds";
+ private static final String KEY_CHARGING_SOUNDS = "charging_sounds";
private static final String KEY_DOCKING_SOUNDS = "docking_sounds";
private static final String KEY_TOUCH_SOUNDS = "touch_sounds";
private static final String KEY_VIBRATE_ON_TOUCH = "vibrate_on_touch";
@@ -77,6 +78,9 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In
private static final SettingPref PREF_SCREEN_LOCKING_SOUNDS = new SettingPref(
TYPE_SYSTEM, KEY_SCREEN_LOCKING_SOUNDS, System.LOCKSCREEN_SOUNDS_ENABLED, DEFAULT_ON);
+ private static final SettingPref PREF_CHARGING_SOUNDS = new SettingPref(
+ TYPE_GLOBAL, KEY_CHARGING_SOUNDS, Global.CHARGING_SOUNDS_ENABLED, DEFAULT_ON);
+
private static final SettingPref PREF_DOCKING_SOUNDS = new SettingPref(
TYPE_GLOBAL, KEY_DOCKING_SOUNDS, Global.DOCK_SOUNDS_ENABLED, DEFAULT_ON) {
@Override
@@ -155,6 +159,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In
private static final SettingPref[] PREFS = {
PREF_DIAL_PAD_TONES,
PREF_SCREEN_LOCKING_SOUNDS,
+ PREF_CHARGING_SOUNDS,
PREF_DOCKING_SOUNDS,
PREF_TOUCH_SOUNDS,
PREF_VIBRATE_ON_TOUCH,