Merge "fix(HCT): shows HCT background for invisible text" into main

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index e84bfae014eb..2fa56137a8a0 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1021,6 +1021,12 @@ public abstract class Layout {
             return;
         }
 
+        if (!mSpannedText || mSpanColors == null) {
+            if (mPaint.getAlpha() == 0) {
+                return;
+            }
+        }
+
         var padding = Math.max(HIGH_CONTRAST_TEXT_BORDER_WIDTH_MIN_PX,
                 mPaint.getTextSize() * HIGH_CONTRAST_TEXT_BORDER_WIDTH_FACTOR);
         var cornerRadius = mPaint.density * HIGH_CONTRAST_TEXT_BACKGROUND_CORNER_RADIUS_DP;