Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Setting the default value for dock audio"

Browse Source
This commit is contained in:
Dianne Hackborn
2013-01-07 12:17:25 -08:00
committed by Gerrit Code Review
parent 350d5168e4 729f6685f9
commit b2d3904b0d
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -77,6 +77,7 @@
<string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string> <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>
<bool name="def_lockscreen_disabled">false</bool> <bool name="def_lockscreen_disabled">false</bool>
<bool name="def_device_provisioned">false</bool> <bool name="def_device_provisioned">false</bool>
<integer name="def_dock_audio_media_enabled">1</integer>
<!-- Notifications use ringer volume --> <!-- Notifications use ringer volume -->
<bool name="def_notifications_use_ring_volume">true</bool> <bool name="def_notifications_use_ring_volume">true</bool>

3
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -2181,6 +2181,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadStringSetting(stmt, Settings.Global.CAR_UNDOCK_SOUND, loadStringSetting(stmt, Settings.Global.CAR_UNDOCK_SOUND,
R.string.def_car_undock_sound); R.string.def_car_undock_sound);
loadIntegerSetting(stmt, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED,
R.integer.def_dock_audio_media_enabled);
loadSetting(stmt, Settings.Global.SET_INSTALL_LOCATION, 0); loadSetting(stmt, Settings.Global.SET_INSTALL_LOCATION, 0);
loadSetting(stmt, Settings.Global.DEFAULT_INSTALL_LOCATION, loadSetting(stmt, Settings.Global.DEFAULT_INSTALL_LOCATION,
PackageHelper.APP_INSTALL_AUTO); PackageHelper.APP_INSTALL_AUTO);