commit 9f5cd3c273d88f3e5a183b49208e6b1a9eecdd2e
author Amith Yamasani <yamasani@google.com> Wed Aug 10 14:21:03 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 10 14:21:03 2011 -0700
tree 1c6f0cd1f81af56dde1035ef8190ae980dd26cfb
parent 2d75f8294a2419f70abbc38267d08609d1969a4e
parent 7f0d760ea5350ae87c3db8cc94d6a25ce64aaebb

Merge "Volumes panel shouldn't depend on Silent mode setting."

res/xml/sound_settings.xml

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"

src/com/android/settings/RingerVolumePreference.java

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 129edee..eceb594 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -182,8 +182,8 @@
                 public void onReceive(Context context, Intent intent) {
                     final String action = intent.getAction();
                     if (AudioManager.RINGER_MODE_CHANGED_ACTION.equals(action)) {
-                        mHandler.sendMessage(mHandler.obtainMessage(MSG_RINGER_MODE_CHANGED,
-                                intent.getIntExtra(AudioManager.EXTRA_RINGER_MODE, -1), 0));
+                        mHandler.sendMessage(mHandler.obtainMessage(MSG_RINGER_MODE_CHANGED, intent
+                                .getIntExtra(AudioManager.EXTRA_RINGER_MODE, -1), 0));
                     }
                 }
             };
@@ -222,7 +222,10 @@
     @Override
     public void onActivityStop() {
         super.onActivityStop();
-        cleanup();
+
+        for (SeekBarVolumizer vol : mSeekBarVolumizer) {
+            if (vol != null) vol.stopSample();
+        }
     }
 
     @Override