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

am 74d7c778: am 765e1592: Merge "Volume: Use inactive slider tints when disabled." into mnc-dev

Browse Source 
* commit '74d7c77860e5d2e8e04780999a0cf74960c97542':
  Volume: Use inactive slider tints when disabled.
This commit is contained in:
John Spurlock
2015-05-13 21:00:50 +00:00
committed by Android Git Automerger
parent 8fd6d67155 74d7c77860
commit 2508ab5758
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;