From 7f0d760ea5350ae87c3db8cc94d6a25ce64aaebb Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 9 Aug 2011 10:52:38 -0700
Subject: [PATCH] Volumes panel shouldn't depend on Silent mode setting.

Otherwise it wont be possible to adjust alarm and music volumes.
Also fixes an inconsistent state when screen is turned off and on.

Bug: 5128528
Bug: 5128850

Change-Id: I3bfae44956de291b086905b9f43ca4ff5c7b9bbf
---
 res/xml/sound_settings.xml                           | 3 +--
 src/com/android/settings/RingerVolumePreference.java | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d5f0e6b58e4..a13d6fc1546 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"
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 129edee386c..eceb59414c9 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -182,8 +182,8 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
                 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 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
     @Override
     public void onActivityStop() {
         super.onActivityStop();
-        cleanup();
+
+        for (SeekBarVolumizer vol : mSeekBarVolumizer) {
+            if (vol != null) vol.stopSample();
+        }
     }
 
     @Override