Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a

Browse Source 
am: 657abc315d

Change-Id: I295d50e9513775dddb2aea3686275264d7e0f12c
This commit is contained in:
Shigeki Yokomichi
2017-02-16 13:06:27 +00:00
committed by android-build-merger
parent 7973ff4c13 657abc315d
commit 4b06345751
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/preference/SeekBarVolumizer.java
View File

@@ -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();
}
}