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

Commit b76468a6 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix animating quick settings tiles"

parents fceeed75 068cb8ba

packages/SystemUI/src/com/android/systemui/qs/QSTileView.java

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ public class QSTileView extends QSTileBaseView { 
        final ImageView icon = new ImageView(mContext);

        icon.setId(android.R.id.icon);

        icon.setScaleType(ScaleType.CENTER_INSIDE);

        icon.setImageTintList(ColorStateList.valueOf(getContext().getColor(android.R.color.white)));

        return icon;

    }

packages/SystemUI/src/com/android/systemui/qs/tiles/CustomTile.java

+4 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Intent; 
import android.content.ServiceConnection;

import android.content.pm.PackageManager;

import android.content.pm.ServiceInfo;

import android.graphics.drawable.Drawable;

import android.os.IBinder;

import android.os.UserHandle;

import android.service.quicksettings.IQSTileService;
@@ -132,7 +133,9 @@ public class CustomTile extends QSTile<QSTile.State> { 
    @Override

    protected void handleUpdateState(State state, Object arg) {

        state.visible = true;

        state.icon = new DrawableIcon(mTile.getIcon().loadDrawable(mContext));

        Drawable drawable = mTile.getIcon().loadDrawable(mContext);

        drawable.setTint(mContext.getColor(android.R.color.white));

        state.icon = new DrawableIcon(drawable);

        state.label = mTile.getLabel();

        if (mTile.getContentDescription() != null) {

            state.contentDescription = mTile.getContentDescription();