am c5c0edae: am 7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev

* commit 'c5c0edae5804b813a4f1548574f72d7c2097cc7e':
  Settings: Restart volumizers explicitly on resume.

src/com/android/settings/notification/NotificationSettings.java

@@ -82,6 +82,7 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
     private final H mHandler = new H();
     private final SettingsObserver mSettingsObserver = new SettingsObserver();
     private final Receiver mReceiver = new Receiver();
+    private final ArrayList<VolumeSeekBarPreference> mVolumePrefs = new ArrayList<>();
 
     private Context mContext;
     private PackageManager mPM;
@@ -148,6 +149,9 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
         mSettingsObserver.register(true);
         mReceiver.register(true);
         updateEffectsSuppressor();
+        for (VolumeSeekBarPreference volumePref : mVolumePrefs) {
+            volumePref.onActivityResume();
+        }
     }
 
     @Override
@@ -159,11 +163,11 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
     }
 
     // === Volumes ===
-
     private VolumeSeekBarPreference initVolumePreference(String key, int stream) {
         final VolumeSeekBarPreference volumePref = (VolumeSeekBarPreference) findPreference(key);
         volumePref.setCallback(mVolumeCallback);
         volumePref.setStream(stream);
+        mVolumePrefs.add(volumePref);
         return volumePref;
     }
 

src/com/android/settings/notification/VolumeSeekBarPreference.java

@@ -120,6 +120,12 @@ public class VolumeSeekBarPreference extends SeekBarPreference
         updateSuppressionText();
     }
 
+    public void onActivityResume() {
+        if (mVolumizer != null) {
+            mVolumizer.start();
+        }
+    }
+
     // during initialization, this preference is the SeekBar listener
     @Override
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {