fix(android): rebase onto CanvasEffectSpan rename

Upstream #56705 renamed DrawCommandSpan and dropped its `ReactSpan` marker; re-add the interface on the underline/strikethrough subclasses so `SetSpanOperation` still accepts them.

Author: quantizor

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java

@@ -46,7 +46,7 @@
 import com.facebook.react.uimanager.style.BorderStyle;
 import com.facebook.react.uimanager.style.LogicalEdge;
 import com.facebook.react.uimanager.style.Overflow;
-import com.facebook.react.views.text.internal.span.DrawCommandSpan;
+import com.facebook.react.views.text.internal.span.CanvasEffectSpan;
 import com.facebook.react.views.text.internal.span.ReactFragmentIndexSpan;
 import com.facebook.react.views.text.internal.span.ReactTagSpan;
 import com.facebook.yoga.YogaMeasureMode;
@@ -218,13 +218,10 @@ protected void onDraw(Canvas canvas) {
       if (spanned != null) {
         Layout layout = getLayout();
         if (layout != null) {
-          DrawCommandSpan[] drawSpans =
-              spanned.getSpans(0, spanned.length(), DrawCommandSpan.class);
+          CanvasEffectSpan[] drawSpans =
+              spanned.getSpans(0, spanned.length(), CanvasEffectSpan.class);
           if (drawSpans.length > 0) {
-            // Mirror TextView.getVerticalOffset() — it's private upstream so we
-            // recompute the gravity-driven offset that `super.onDraw` applies
-            // before painting glyphs. Without this the span draws would land at
-            // the top of the view while text is centered or bottom-aligned.
+            // TextView.getVerticalOffset() is private; recompute it here.
             int voffsetText = 0;
             if ((getGravity() & Gravity.VERTICAL_GRAVITY_MASK) != Gravity.TOP) {
               int boxHeight =
@@ -240,7 +237,7 @@ protected void onDraw(Canvas canvas) {
             }
             canvas.save();
             canvas.translate(getCompoundPaddingLeft(), getExtendedPaddingTop() + voffsetText);
-            for (DrawCommandSpan span : drawSpans) {
+            for (CanvasEffectSpan span : drawSpans) {
               int start = spanned.getSpanStart(span);
               int end = spanned.getSpanEnd(span);
               span.onDraw(start, end, canvas, layout);

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactStrikethroughSpan.kt

@@ -15,7 +15,7 @@ import kotlin.math.max
 
 /**
  * Draws a strikethrough whose color may differ from the text color. Subclasses
- * [DrawCommandSpan] so [PreparedLayoutTextView] and [ReactTextView] invoke
+ * [CanvasEffectSpan] so [PreparedLayoutTextView] and [ReactTextView] invoke
  * [onDraw] after the layout renders its text. We do NOT extend
  * [android.text.style.StrikethroughSpan] here: the framework's `Layout.draw`
  * paints the strikethrough using `paint.color` with no field to override,
@@ -26,7 +26,7 @@ import kotlin.math.max
  * text's foreground color, matching the platform's prior behavior.
  */
 internal class ReactStrikethroughSpan(private val color: Int = Color.TRANSPARENT) :
-    DrawCommandSpan() {
+    CanvasEffectSpan(), ReactSpan {
 
   override fun onDraw(start: Int, end: Int, canvas: Canvas, layout: Layout) {
     val paint = layout.paint

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/ReactUnderlineSpan.kt

@@ -15,7 +15,7 @@ import kotlin.math.max
 
 /**
  * Draws an underline whose color may differ from the text color. Subclasses
- * [DrawCommandSpan] so [PreparedLayoutTextView] invokes [onDraw] after the
+ * [CanvasEffectSpan] so [PreparedLayoutTextView] invokes [onDraw] after the
  * layout renders its text, ensuring the underline paints on top of any
  * descenders. We do NOT extend [android.text.style.UnderlineSpan] here:
  * the framework's `Layout.draw` reads `paint.color` for underline color
@@ -27,7 +27,7 @@ import kotlin.math.max
  * text's foreground color, matching the platform's prior behavior.
  */
 internal class ReactUnderlineSpan(private val color: Int = Color.TRANSPARENT) :
-    DrawCommandSpan() {
+    CanvasEffectSpan(), ReactSpan {
 
   override fun onDraw(start: Int, end: Int, canvas: Canvas, layout: Layout) {
     val paint = layout.paint