From ecc80587a60c6a4d54905f910ce11abb991bd3ee Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 13 May 2015 16:23:14 -0400 Subject: [PATCH] Volume: Use inactive slider tints when disabled. Bug: 21119650 Change-Id: I14e10c83e9d73096775f92d5290306b76eba6af4 --- .../com/android/systemui/volume/VolumeDialog.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java index 4bc45dfddf663..6e0ca3c7e9193 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java @@ -533,8 +533,7 @@ public class VolumeDialog { } Util.setVisOrInvis(row.settingsButton, false); row.header.setAlpha(mExpanded && isActive ? 1 : 0.5f); - row.slider.setProgressTintList(isActive ? mActiveSliderTint : mInactiveSliderTint); - row.slider.setThumbTintList(isActive ? mActiveSliderTint : mInactiveSliderTint); + updateVolumeRowSliderTintH(row, isActive); } } @@ -666,8 +665,18 @@ public class VolumeDialog { updateVolumeRowSliderH(row, zenMuted); } + private void updateVolumeRowSliderTintH(VolumeRow row, boolean isActive) { + final ColorStateList tint = isActive && row.slider.isEnabled() ? mActiveSliderTint + : mInactiveSliderTint; + if (tint == row.cachedSliderTint) return; + row.cachedSliderTint = tint; + row.slider.setProgressTintList(tint); + row.slider.setThumbTintList(tint); + } + private void updateVolumeRowSliderH(VolumeRow row, boolean zenMuted) { row.slider.setEnabled(!zenMuted); + updateVolumeRowSliderTintH(row, row.stream == mActiveStream); if (row.tracking) { return; // don't update if user is sliding } @@ -1027,6 +1036,7 @@ public class VolumeDialog { private int iconMuteRes; private boolean important; private int cachedIconRes; + private ColorStateList cachedSliderTint; private int iconState; // from Events private boolean cachedShowHeaders = VolumePrefs.DEFAULT_SHOW_HEADERS; private int cachedExpandButtonRes;