am 7da7c222: Merge "Settings: Restart volumizers explicitly on resume." into lmp-mr1-dev (c5c0edae) · Commits · e / os / android_packages_apps_Settings

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -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) {