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

am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb

Browse Source 
* commit 'b58b5db4ba8edc075f6524df200aa8d3c678e267':
  Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
This commit is contained in:
Amith Yamasani
2011-01-21 14:49:34 -08:00
committed by Android Git Automerger
parent b2b830774f b58b5db4ba
commit 610dff54fc
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/provider/Settings.java
View File

@@ -1801,7 +1801,6 @@ public final class Settings {
SCREEN_BRIGHTNESS,
SCREEN_BRIGHTNESS_MODE,
VIBRATE_ON,
NOTIFICATIONS_USE_RING_VOLUME,
MODE_RINGER,
MODE_RINGER_STREAMS_AFFECTED,
MUTE_STREAMS_AFFECTED,

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

@@ -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>

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

@@ -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();
}