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

Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread

Browse Source
This commit is contained in:
Amith Yamasani
2011-01-18 15:41:26 -08:00
committed by Android (Google) Code Review
parent 4170b46329 18b41374e8
commit 6815382148
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,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>
</resources>

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

@@ -1068,6 +1068,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,
R.bool.def_vibrate_in_silent);
// 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();
}