Permalink
Browse files

SettingsProvider: Allow default volume adjust sound to be overlayed.

Issue-id: YAM-145
Change-Id: I06394c4fcfca5978b50a4186935ac6bda7b94b16
  • Loading branch information...
Ankit Gupta authored and akhilnarang committed Feb 17, 2016
1 parent 8a6266f commit a51afef90fb1a6823b9af05d52505335986b6a1a
@@ -3754,6 +3754,12 @@ public boolean validate(String value) {
*/
public static final String VOLBTN_MUSIC_CONTROLS = "volbtn_music_controls";
/**
* Whether the phone volume up / down effect should be played
* @hide
*/
public static final String VOLUME_ADJUST_SOUNDS_ENABLED = "volume_adjust_sounds_enabled";
/**
* Change the delay when a screenshot is taken
* @hide
@@ -81,6 +81,7 @@
<string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>
<string name="def_trusted_sound" translatable="false">/system/media/audio/ui/Trusted.ogg</string>
<string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string>
<bool name="def_volume_adjust_sounds_enabled">true</bool>
<bool name="def_lockscreen_disabled">false</bool>
<bool name="def_device_provisioned">false</bool>
@@ -2429,6 +2429,8 @@ private void loadUISoundEffectsSettings(SQLiteStatement stmt) {
R.bool.def_sound_effects_enabled);
loadBooleanSetting(stmt, Settings.System.HAPTIC_FEEDBACK_ENABLED,
R.bool.def_haptic_feedback);
loadBooleanSetting(stmt, Settings.System.VOLUME_ADJUST_SOUNDS_ENABLED,
R.bool.def_volume_adjust_sounds_enabled);
loadIntegerSetting(stmt, Settings.System.LOCKSCREEN_SOUNDS_ENABLED,
R.integer.def_lockscreen_sounds_enabled);

0 comments on commit a51afef

Please sign in to comment.