summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-08-10 14:21:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-10 14:21:03 -0700
commit9f5cd3c273d88f3e5a183b49208e6b1a9eecdd2e (patch)
tree1c6f0cd1f81af56dde1035ef8190ae980dd26cfb /res/xml
parent2d75f8294a2419f70abbc38267d08609d1969a4e (diff)
parent7f0d760ea5350ae87c3db8cc94d6a25ce64aaebb (diff)
downloadpackages_apps_Settings-9f5cd3c273d88f3e5a183b49208e6b1a9eecdd2e.zip
packages_apps_Settings-9f5cd3c273d88f3e5a183b49208e6b1a9eecdd2e.tar.gz
packages_apps_Settings-9f5cd3c273d88f3e5a183b49208e6b1a9eecdd2e.tar.bz2
Merge "Volumes panel shouldn't depend on Silent mode setting."
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/sound_settings.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d5f0e6b..a13d6fc 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -21,7 +21,6 @@
<com.android.settings.RingerVolumePreference
android:key="ring_volume"
- android:dependency="silent"
android:title="@string/all_volume_title"
android:dialogTitle="@string/all_volume_title"
android:persistent="false"
@@ -37,7 +36,7 @@
android:key="silent"
android:title="@string/silent_mode_title"
android:persistent="false"
- android:disableDependentsState="true" />
+ />
<Preference
android:key="musicfx"