Update @RestrictTo for ui-android-text
- Removed some not-needed @RestrictTo’s from ui-android-text
- Also removed unused Unicode class
Test: None
Bug: 141371566
Change-Id: I5ec92fd9b14f868d26edd4472a202f3e2dfe3310
diff --git a/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt b/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt
index 8bccd84..70f0de9 100644
--- a/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt
+++ b/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/AndroidParagraphTest.kt
@@ -13,7 +13,7 @@
import android.text.style.UnderlineSpan
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.text.StaticLayoutCompat
+import androidx.text.TextLayout
import androidx.text.style.BaselineShiftSpan
import androidx.text.style.FontFeatureSpan
import androidx.text.style.LetterSpacingSpan
@@ -91,14 +91,13 @@
textPaint.textSize = fontSize.toPx().value
textPaint.typeface = TypefaceAdapter().create(fontFamily)
- val staticLayout = StaticLayoutCompat.Builder(
- text,
- textPaint,
- ceil(paragraphAndroid.width).toInt()
+ val layout = TextLayout(
+ charSequence = text,
+ width = ceil(paragraphAndroid.width),
+ textPaint = textPaint
)
- .setEllipsizedWidth(ceil(paragraphAndroid.width).toInt())
- .build()
- assertThat(paragraphAndroid.bitmap()).isEqualToBitmap(staticLayout.bitmap())
+
+ assertThat(paragraphAndroid.bitmap()).isEqualToBitmap(layout.bitmap())
}
}
}