diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-01-21 14:51:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-21 14:51:34 -0800 |
| commit | 54468ba12ebc630f794fcf148669519326e50d82 (patch) | |
| tree | a3a79a126c0b6890c0a6f261d4198d0f0bf31bab /packages | |
| parent | caed39164074a3d0e69c0841410c3833c11932d6 (diff) | |
| parent | 610dff54fc6f350e1f7976027bb69a813fa055af (diff) | |
| download | frameworks_base-54468ba12ebc630f794fcf148669519326e50d82.zip frameworks_base-54468ba12ebc630f794fcf148669519326e50d82.tar.gz frameworks_base-54468ba12ebc630f794fcf148669519326e50d82.tar.bz2 | |
am 610dff54: am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
* commit '610dff54fc6f350e1f7976027bb69a813fa055af':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 5981139..27c8aea 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -71,6 +71,9 @@ <string name="def_lock_sound" translatable="false">/system/media/audio/ui/Lock.ogg</string> <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string> + <!-- Notifications use ringer volume --> + <bool name="def_notifications_use_ring_volume">true</bool> + <!-- Default for Settings.System.VIBRATE_IN_SILENT --> <bool name="def_vibrate_in_silent">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 bc7473e..580113c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1168,6 +1168,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadBooleanSetting(stmt, Settings.System.USE_PTP_INTERFACE, R.bool.def_use_ptp_interface); + + // Set notification volume to follow ringer volume by default + loadBooleanSetting(stmt, Settings.System.NOTIFICATIONS_USE_RING_VOLUME, + R.bool.def_notifications_use_ring_volume); + } finally { if (stmt != null) stmt.close(); } |