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

Merge "Fix tile color issues" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-05 20:27:45 +00:00
committed by Android (Google) Code Review
parent 4b163155e5 b714201e33
commit c8472887fc
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileView.java
View File

@@ -43,7 +43,7 @@ public class QSTileView extends QSTileBaseView {
protected TextView mLabel;
protected TextView mSecondLine;
private ImageView mPadLock;
private int mState;
protected int mState;
protected ViewGroup mLabelContainer;
private View mExpandIndicator;
private View mExpandSpace;
@@ -133,14 +133,7 @@ public class QSTileView extends QSTileBaseView {
protected void handleStateChanged(QSTile.State state) {
super.handleStateChanged(state);
if (!Objects.equals(mLabel.getText(), state.label) || mState != state.state) {
ColorStateList labelColor;
if (state.state == Tile.STATE_ACTIVE) {
labelColor = mColorLabelActive;
} else if (state.state == Tile.STATE_INACTIVE) {
labelColor = mColorLabelInactive;
} else {
labelColor = mColorLabelUnavailable;
}
ColorStateList labelColor = getLabelColor(state.state);
changeLabelColor(labelColor);
mState = state.state;
mLabel.setText(state.label);
@@ -163,6 +156,15 @@ public class QSTileView extends QSTileBaseView {
mPadLock.setVisibility(state.disabledByPolicy ? View.VISIBLE : View.GONE);
}
protected final ColorStateList getLabelColor(int state) {
if (state == Tile.STATE_ACTIVE) {
return mColorLabelActive;
} else if (state == Tile.STATE_INACTIVE) {
return mColorLabelInactive;
}
return mColorLabelUnavailable;
}
protected void changeLabelColor(ColorStateList color) {
mLabel.setTextColor(color);
}

9
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewHorizontal.kt
View File

@@ -57,6 +57,7 @@ open class QSTileViewHorizontal(
addView(mIcon, 0, LayoutParams(iconSize, iconSize))
mColorLabelActive = ColorStateList.valueOf(getColorForState(getContext(), STATE_ACTIVE))
changeLabelColor(getLabelColor(mState)) // Matches the default state of the tile
}
override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
@@ -121,13 +122,11 @@ open class QSTileViewHorizontal(
if (allowAnimations) {
animateBackground(newColor)
} else {
if (newColor != paintColor) {
clearBackgroundAnimator()
colorBackgroundDrawable?.setTintList(ColorStateList.valueOf(newColor))?.also {
paintColor = newColor
}
clearBackgroundAnimator()
colorBackgroundDrawable?.setTintList(ColorStateList.valueOf(newColor))?.also {
paintColor = newColor
}
paintColor = newColor
}
}