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

am 26c00dec: am b2d3904b: Merge "Setting the default value for dock audio"

Browse Source 
* commit '26c00decb4c0352913396851c2b42a8705976614':
  Setting the default value for dock audio
This commit is contained in:
Dianne Hackborn
2013-01-07 13:53:12 -08:00
committed by Android Git Automerger
parent 449f006f93 26c00decb4
commit 53d998368c
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

@@ -79,6 +79,7 @@
<bool name="def_lockscreen_disabled">false</bool>
<bool name="def_device_provisioned">false</bool>
<integer name="def_dock_audio_media_enabled">1</integer>
<!-- Notifications use ringer volume -->
<bool name="def_notifications_use_ring_volume">true</bool>

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

@@ -2213,6 +2213,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadStringSetting(stmt, Settings.Global.WIRELESS_CHARGING_STARTED_SOUND,
R.string.def_wireless_charging_started_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.DEFAULT_INSTALL_LOCATION,
PackageHelper.APP_INSTALL_AUTO);