Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eab41470 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use new color for unavailable looking tiles" into tm-qpr-dev am: de337b3a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19967565



Change-Id: I0170557c58ec0eab8270799c071818cfd0ae7df2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99a08dbb de337b3a

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java

+5 −8
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class QSIconViewImpl extends QSIconView { 
    protected int mIconSizePx;

    private boolean mAnimationEnabled = true;

    private int mState = -1;

    private boolean mDisabledByPolicy = false;

    private int mTint;

    @Nullable

    private QSTile.Icon mLastIcon;
@@ -159,14 +160,10 @@ public class QSIconViewImpl extends QSIconView { 
    }



    protected void setIcon(ImageView iv, QSTile.State state, boolean allowAnimations) {

        if (state.disabledByPolicy) {

            iv.setColorFilter(getContext().getColor(R.color.qs_tile_disabled_color));

        } else {

            iv.clearColorFilter();

        }

        if (state.state != mState) {

        if (state.state != mState || state.disabledByPolicy != mDisabledByPolicy) {

            int color = getColor(state);

            mState = state.state;

            mDisabledByPolicy = state.disabledByPolicy;

            if (mTint != 0 && allowAnimations && shouldAnimate(iv)) {

                animateGrayScale(mTint, color, iv, () -> updateIcon(iv, state, allowAnimations));

            } else {
@@ -241,8 +238,8 @@ public class QSIconViewImpl extends QSIconView { 
     */

    private static int getIconColorForState(Context context, QSTile.State state) {

        if (state.disabledByPolicy || state.state == Tile.STATE_UNAVAILABLE) {

            return Utils.applyAlpha(QSTileViewImpl.UNAVAILABLE_ALPHA,

                    Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary));

            return Utils.getColorAttrDefaultColor(

                    context, com.android.internal.R.attr.textColorTertiary);

        } else if (state.state == Tile.STATE_INACTIVE) {

            return Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary);

        } else if (state.state == Tile.STATE_ACTIVE) {

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt

+3 −2
Original line number Diff line number Diff line
@@ -100,14 +100,15 @@ open class QSTileViewImpl @JvmOverloads constructor( 
            Utils.getColorAttrDefaultColor(context, com.android.internal.R.attr.textColorOnAccent)

    private val colorLabelInactive =

            Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary)

    private val colorLabelUnavailable = Utils.applyAlpha(UNAVAILABLE_ALPHA, colorLabelInactive)

    private val colorLabelUnavailable =

        Utils.getColorAttrDefaultColor(context, com.android.internal.R.attr.textColorTertiary)



    private val colorSecondaryLabelActive =

            Utils.getColorAttrDefaultColor(context, android.R.attr.textColorSecondaryInverse)

    private val colorSecondaryLabelInactive =

            Utils.getColorAttrDefaultColor(context, android.R.attr.textColorSecondary)

    private val colorSecondaryLabelUnavailable =

            Utils.applyAlpha(UNAVAILABLE_ALPHA, colorSecondaryLabelInactive)

        Utils.getColorAttrDefaultColor(context, com.android.internal.R.attr.textColorTertiary)



    private lateinit var label: TextView

    protected lateinit var secondaryLabel: TextView