Fix zero-width text views for LEGACY graphics in Android U+

Previously, in Android U, for LEGACY graphics, TextViews were always considered to be zero-width. Add a shadow implementation for Paint.nGetRunCharacterAdvance in U. This logic is used in the TextView width calculation. Also preemptively add support for it in V, where the signature has already changed. This also fixes the Robolectric EspressoTest when running with LEGACY graphics. PiperOrigin-RevId: 576275359
robolectric · Oct 27, 2023 · a29c7a6 · a29c7a6
1 parent d068642
commit a29c7a6
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/integration_tests/androidx_test/build.gradle b/integration_tests/androidx_test/build.gradle
@@ -25,9 +25,6 @@ android {
     testOptions {
         unitTests {
             includeAndroidResources = true
-            all {
-                systemProperty 'robolectric.graphicsMode', 'NATIVE'
-            }
         }
     }
     sourceSets {

diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPaint.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPaint.java
@@ -20,6 +20,7 @@
 import android.graphics.Paint;
 import android.graphics.Paint.FontMetricsInt;
 import android.graphics.PathEffect;
+import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.Typeface;
 import org.robolectric.annotation.Implementation;
@@ -559,6 +560,47 @@ protected static float nGetRunAdvance(
     return 0f;
   }
 
+  @Implementation(minSdk = U.SDK_INT, maxSdk = U.SDK_INT)
+  protected static float nGetRunCharacterAdvance(
+      long paintPtr,
+      char[] text,
+      int start,
+      int end,
+      int contextStart,
+      int contextEnd,
+      boolean isRtl,
+      int offset,
+      float[] advances,
+      int advancesIndex) {
+    return nGetRunAdvance(paintPtr, text, start, end, contextStart, contextEnd, isRtl, offset);
+  }
+
+  @Implementation(minSdk = V.SDK_INT)
+  protected static float nGetRunCharacterAdvance(
+      long paintPtr,
+      char[] text,
+      int start,
+      int end,
+      int contextStart,
+      int contextEnd,
+      boolean isRtl,
+      int offset,
+      float[] advances,
+      int advancesIndex,
+      RectF drawingBounds) {
+    return nGetRunCharacterAdvance(
+        paintPtr,
+        text,
+        start,
+        end,
+        contextStart,
+        contextEnd,
+        isRtl,
+        offset,
+        advances,
+        advancesIndex);
+  }
+
   @Implementation(minSdk = N, maxSdk = O_MR1)
   protected static float nGetRunAdvance(
       long paintPtr,