Merge "Fix tokens for App Contrast Pill" into main

2025-03-03 10:55:39 -08:00
parent e7c9940df4 d4cce41c27
commit 0a128474db
2 changed files with 10 additions and 12 deletions
@@ -983,11 +983,14 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,

    @Override
    public void setTextColor(ColorStateList colors) {
-        mTextColor = (shouldDrawAppContrastTile() && !TextUtils.isEmpty(getText()))
-                ? PillColorProvider.getInstance(
-                getContext()).getAppTitleTextPaint().getColor()
-                : colors.getDefaultColor();
-        mTextColorStateList = colors;
+        if (shouldDrawAppContrastTile()) {
+            mTextColor = PillColorProvider.getInstance(
+                    getContext()).getAppTitleTextPaint().getColor();
+        } else {
+            mTextColor = colors.getDefaultColor();
+            mTextColorStateList = colors;
+        }
+
        if (Float.compare(mTextAlpha, 1) == 0) {
            super.setTextColor(colors);
        } else {