Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a am: 657abc315d (bce364b7) · Commits · e / os / android_frameworks_base

core/java/android/preference/SeekBarVolumizer.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -348,8 +348,8 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba
		if (msg.what == UPDATE_SLIDER) {
		if (mSeekBar != null) {
		mLastProgress = msg.arg1;
		mLastAudibleStreamVolume = Math.abs(msg.arg2);
		final boolean muted = msg.arg2 < 0;
		mLastAudibleStreamVolume = msg.arg2;
		final boolean muted = ((Boolean)msg.obj).booleanValue();
		if (muted != mMuted) {
		mMuted = muted;
		if (mCallback != null) {
		@@ -362,8 +362,7 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba
		}

		public void postUpdateSlider(int volume, int lastAudibleVolume, boolean mute) {
		final int arg2 = lastAudibleVolume * (mute ? -1 : 1);
		obtainMessage(UPDATE_SLIDER, volume, arg2).sendToTarget();
		obtainMessage(UPDATE_SLIDER, volume, lastAudibleVolume, new Boolean(mute)).sendToTarget();
		}
		}