diff options
| author | Dmytro Dubovyk <dmytro.dubovyk@ti.com> | 2012-12-18 18:07:50 +0200 |
|---|---|---|
| committer | Sergii Iegorov <x0155539@ti.com> | 2012-12-19 11:14:38 +0200 |
| commit | 729f6685f9dfb7a1813a89dbf2298024d9da3813 (patch) | |
| tree | aea36c6ab06c38e7e841dcad0713f8c1c2de06fb /packages/SettingsProvider | |
| parent | 7979b58a7ade37c3b6d574fd647e633c5b57c3f1 (diff) | |
| download | frameworks_base-729f6685f9dfb7a1813a89dbf2298024d9da3813.zip frameworks_base-729f6685f9dfb7a1813a89dbf2298024d9da3813.tar.gz frameworks_base-729f6685f9dfb7a1813a89dbf2298024d9da3813.tar.bz2 | |
Setting the default value for dock audio
There was no default value for parameter "dock_audio_media_enabled"
in global settings and because of that it couldn't be obtained before
Settings app first start and improper actions, such as FORCE_NONE
sending to AudioSystem instead of FORCE_ANALOG_DOCK, were taken.
This patch sets default value to 'true'.
Change-Id: Idbe343519db15f806f3a237e8b39f8420b9edde1
Signed-off-by: Dmytro Dubovyk <dmytro.dubovyk@ti.com>
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 | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 94e2286..52df8d0 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -77,6 +77,7 @@ <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string> <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> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b649b43..7864ec2 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2181,6 +2181,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadStringSetting(stmt, Settings.Global.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.DEFAULT_INSTALL_LOCATION, PackageHelper.APP_INSTALL_AUTO); |