summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2010-03-30 14:55:23 -0400
committerDaniel Sandler <dsandler@android.com>2010-03-30 14:55:23 -0400
commit781100911187bcaf21caeedc3f9e431ae7029ab8 (patch)
treeb16a1e6ef70c417c73c9ef9db226546f6ec96a63 /res
parent39e64e76c14f6ad0a844cea6c9ea9865f0b9261e (diff)
downloadpackages_apps_Settings-781100911187bcaf21caeedc3f9e431ae7029ab8.zip
packages_apps_Settings-781100911187bcaf21caeedc3f9e431ae7029ab8.tar.gz
packages_apps_Settings-781100911187bcaf21caeedc3f9e431ae7029ab8.tar.bz2
Restore dependency between volume settings and silent mode.
Volume (of the ringer, notifications, media, and alarms) may no longer be adjusted while the phone is in silent mode. This was the behavior in Eclair and earlier releases. This rolls back a small portion of change I724c43aa in the interest of stability (see bugs listed below for weirdness that occurs when the ringer's SeekBarVolumizer is visible when the ringtone stream is muted). Bug: 2552268 Bug: 2544706 Change-Id: I4858e6d85e5ec8c4bba83b649e24dd5915252eb2
Diffstat (limited to 'res')
-rw-r--r--res/xml/sound_settings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 895709b..bcb49ec 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -36,6 +36,7 @@
<com.android.settings.RingerVolumePreference
android:key="ring_volume"
+ android:dependency="silent"
android:title="@string/all_volume_title"
android:summary="@string/ring_volume_summary"
android:dialogTitle="@string/all_volume_title"