PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Add setting to mute wireless charging sound.

Browse Source 
Bug: 19538553
Change-Id: I93228aee38f8eb035025409ce063f3050bf9bb9a
This commit is contained in:
John Spurlock
2015-05-06 17:42:30 -04:00
parent 0d2a8d204b
commit ae91c0a99a
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -5969,6 +5969,9 @@
<!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] --> <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
<string name="screen_locking_sounds_title">Screen locking sounds</string> <string name="screen_locking_sounds_title">Screen locking sounds</string>
<!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
<string name="charging_sounds_title">Charging sounds</string>
<!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] --> <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
<string name="docking_sounds_title">Docking sounds</string> <string name="docking_sounds_title">Docking sounds</string>

8
res/xml/other_sound_settings.xml
View File

@@ -35,6 +35,14 @@
android:switchTextOn="" android:switchTextOn=""
android:persistent="false" /> android:persistent="false" />
<!-- Charging sounds -->
<SwitchPreference
android:key="charging_sounds"
android:title="@string/charging_sounds_title"
android:switchTextOff=""
android:switchTextOn=""
android:persistent="false" />
<!-- Docking sounds --> <!-- Docking sounds -->
<SwitchPreference <SwitchPreference
android:key="docking_sounds" android:key="docking_sounds"

5
src/com/android/settings/notification/OtherSoundSettings.java
View File

@@ -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_DIAL_PAD_TONES = "dial_pad_tones";
private static final String KEY_SCREEN_LOCKING_SOUNDS = "screen_locking_sounds"; 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_DOCKING_SOUNDS = "docking_sounds";
private static final String KEY_TOUCH_SOUNDS = "touch_sounds"; private static final String KEY_TOUCH_SOUNDS = "touch_sounds";
private static final String KEY_VIBRATE_ON_TOUCH = "vibrate_on_touch"; 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( private static final SettingPref PREF_SCREEN_LOCKING_SOUNDS = new SettingPref(
TYPE_SYSTEM, KEY_SCREEN_LOCKING_SOUNDS, System.LOCKSCREEN_SOUNDS_ENABLED, DEFAULT_ON); 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( private static final SettingPref PREF_DOCKING_SOUNDS = new SettingPref(
TYPE_GLOBAL, KEY_DOCKING_SOUNDS, Global.DOCK_SOUNDS_ENABLED, DEFAULT_ON) { TYPE_GLOBAL, KEY_DOCKING_SOUNDS, Global.DOCK_SOUNDS_ENABLED, DEFAULT_ON) {
@Override @Override
@@ -155,6 +159,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In
private static final SettingPref[] PREFS = { private static final SettingPref[] PREFS = {
PREF_DIAL_PAD_TONES, PREF_DIAL_PAD_TONES,
PREF_SCREEN_LOCKING_SOUNDS, PREF_SCREEN_LOCKING_SOUNDS,
PREF_CHARGING_SOUNDS,
PREF_DOCKING_SOUNDS, PREF_DOCKING_SOUNDS,
PREF_TOUCH_SOUNDS, PREF_TOUCH_SOUNDS,
PREF_VIBRATE_ON_TOUCH, PREF_VIBRATE_ON_TOUCH,