diff options
| author | Ankit Gupta <agupta@cyngn.com> | 2016-02-17 15:48:17 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-04-06 16:19:46 -0700 |
| commit | 89c3e36c3149438b8d0e3e438923dc95a15237db (patch) | |
| tree | be1fa6210388848c5eb83ecef466c3c2efffe877 /packages/SettingsProvider | |
| parent | 9ce1a95db477a6f741ea54098329f3a1a8f6c190 (diff) | |
| download | frameworks_base-89c3e36c3149438b8d0e3e438923dc95a15237db.zip frameworks_base-89c3e36c3149438b8d0e3e438923dc95a15237db.tar.gz frameworks_base-89c3e36c3149438b8d0e3e438923dc95a15237db.tar.bz2 | |
SettingsProvider: Allow default volume adjust sound to be overlayed.
Issue-id: YAM-145
Change-Id: I06394c4fcfca5978b50a4186935ac6bda7b94b16
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 1 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 76b7d6f..9ecbfdd 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -86,6 +86,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> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index f5f8ce6..e61868f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2622,6 +2622,8 @@ class DatabaseHelper extends SQLiteOpenHelper { 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); |