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

am 66f6cd63: Merge "Volume: Show disabled level on slider when muted by zen." into mnc-dev

Browse Source 
* commit '66f6cd63b710e0accf15c584c0bda26561425931':
  Volume: Show disabled level on slider when muted by zen.
This commit is contained in:
John Spurlock
2015-06-09 19:12:23 +00:00
committed by Android Git Automerger
parent 46c9249879 66f6cd63b7
commit c4730aec9b
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
View File

@@ -386,18 +386,8 @@ public class VolumeDialog {
} }
} }
} else { } else {
if (mAutomute && !row.ss.muteSupported) { final boolean vmute = row.ss.level == 0;
final boolean vmute = row.ss.level == 0; mController.setStreamVolume(stream, vmute ? row.lastAudibleLevel : 0);
mController.setStreamVolume(stream, vmute ? row.lastAudibleLevel : 0);
} else {
final boolean mute = !row.ss.muted;
mController.setStreamMute(stream, mute);
if (mAutomute) {
if (!mute && row.ss.level == 0) {
mController.setStreamVolume(stream, 1);
}
}
}
} }
row.userAttempt = 0; // reset the grace period, slider should update immediately row.userAttempt = 0; // reset the grace period, slider should update immediately
} }
@@ -589,6 +579,9 @@ public class VolumeDialog {
if (ss.level > 0) { if (ss.level > 0) {
row.lastAudibleLevel = ss.level; row.lastAudibleLevel = ss.level;
} }
if (ss.level == row.requestedLevel) {
row.requestedLevel = -1;
}
final boolean isRingStream = row.stream == AudioManager.STREAM_RING; final boolean isRingStream = row.stream == AudioManager.STREAM_RING;
final boolean isSystemStream = row.stream == AudioManager.STREAM_SYSTEM; final boolean isSystemStream = row.stream == AudioManager.STREAM_SYSTEM;
final boolean isAlarmStream = row.stream == AudioManager.STREAM_ALARM; final boolean isAlarmStream = row.stream == AudioManager.STREAM_ALARM;
@@ -664,7 +657,10 @@ public class VolumeDialog {
row.icon.setContentDescription(ss.name); row.icon.setContentDescription(ss.name);
// update slider // update slider
updateVolumeRowSliderH(row, zenMuted); final boolean enableSlider = !zenMuted;
final int vlevel = row.ss.muted && (isRingVibrate || !isRingStream && !zenMuted) ? 0
: row.ss.level;
updateVolumeRowSliderH(row, enableSlider, vlevel);
} }
private void updateVolumeRowSliderTintH(VolumeRow row, boolean isActive) { private void updateVolumeRowSliderTintH(VolumeRow row, boolean isActive) {
@@ -676,8 +672,8 @@ public class VolumeDialog {
row.slider.setThumbTintList(tint); row.slider.setThumbTintList(tint);
} }
private void updateVolumeRowSliderH(VolumeRow row, boolean zenMuted) { private void updateVolumeRowSliderH(VolumeRow row, boolean enable, int vlevel) {
row.slider.setEnabled(!zenMuted); row.slider.setEnabled(enable);
updateVolumeRowSliderTintH(row, row.stream == mActiveStream); updateVolumeRowSliderTintH(row, row.stream == mActiveStream);
if (row.tracking) { if (row.tracking) {
return; // don't update if user is sliding return; // don't update if user is sliding
@@ -694,7 +690,6 @@ public class VolumeDialog {
row.userAttempt + USER_ATTEMPT_GRACE_PERIOD); row.userAttempt + USER_ATTEMPT_GRACE_PERIOD);
return; // don't update if visible and in grace period return; // don't update if visible and in grace period
} }
final int vlevel = row.ss.muted ? 0 : row.ss.level;
if (vlevel == level) { if (vlevel == level) {
if (mShowing && rowVisible) { if (mShowing && rowVisible) {
return; // don't clamp if visible return; // don't clamp if visible
@@ -1018,7 +1013,7 @@ public class VolumeDialog {
private StreamState ss; private StreamState ss;
private long userAttempt; // last user-driven slider change private long userAttempt; // last user-driven slider change
private boolean tracking; // tracking slider touch private boolean tracking; // tracking slider touch
private int requestedLevel; private int requestedLevel = -1; // pending user-requested level via progress changed
private int iconRes; private int iconRes;
private int iconMuteRes; private int iconMuteRes;
private boolean important; private boolean important;