Merge "Introduce asComposePaint API" into snap-temp-L70600000960978477

11 files changed, 26 insertions, 11 deletions

diff --git a/compose/ui/ui-graphics/api/1.5.0-beta02.txt b/compose/ui/ui-graphics/api/1.5.0-beta02.txt
index 55136acafd5..e406d9cc53f 100644
--- a/compose/ui/ui-graphics/api/1.5.0-beta02.txt
+++ b/compose/ui/ui-graphics/api/1.5.0-beta02.txt
@@ -77,7 +77,7 @@ package androidx.compose.ui.graphics {
 
   public final class AndroidPaint_androidKt {
     method public static androidx.compose.ui.graphics.Paint Paint();
-    method public static androidx.compose.ui.graphics.Paint toComposePaint(android.graphics.Paint);
+    method public static androidx.compose.ui.graphics.Paint asComposePaint(android.graphics.Paint);
   }
 
   public final class AndroidPath implements androidx.compose.ui.graphics.Path {
diff --git a/compose/ui/ui-graphics/api/current.ignore b/compose/ui/ui-graphics/api/current.ignore
new file mode 100644
index 00000000000..dad316bacb5
--- /dev/null
+++ b/compose/ui/ui-graphics/api/current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedMethod: androidx.compose.ui.graphics.AndroidPaint_androidKt#toComposePaint(android.graphics.Paint):
+    Removed method androidx.compose.ui.graphics.AndroidPaint_androidKt.toComposePaint(android.graphics.Paint)
diff --git a/compose/ui/ui-graphics/api/current.txt b/compose/ui/ui-graphics/api/current.txt
index 55136acafd5..e406d9cc53f 100644
--- a/compose/ui/ui-graphics/api/current.txt
+++ b/compose/ui/ui-graphics/api/current.txt
@@ -77,7 +77,7 @@ package androidx.compose.ui.graphics {
 
   public final class AndroidPaint_androidKt {
     method public static androidx.compose.ui.graphics.Paint Paint();
-    method public static androidx.compose.ui.graphics.Paint toComposePaint(android.graphics.Paint);
+    method public static androidx.compose.ui.graphics.Paint asComposePaint(android.graphics.Paint);
   }
 
   public final class AndroidPath implements androidx.compose.ui.graphics.Path {
diff --git a/compose/ui/ui-graphics/api/public_plus_experimental_1.5.0-beta02.txt b/compose/ui/ui-graphics/api/public_plus_experimental_1.5.0-beta02.txt
index 6ee15681a7e..4e34ee369cc 100644
--- a/compose/ui/ui-graphics/api/public_plus_experimental_1.5.0-beta02.txt
+++ b/compose/ui/ui-graphics/api/public_plus_experimental_1.5.0-beta02.txt
@@ -77,7 +77,7 @@ package androidx.compose.ui.graphics {
 
   public final class AndroidPaint_androidKt {
     method public static androidx.compose.ui.graphics.Paint Paint();
-    method public static androidx.compose.ui.graphics.Paint toComposePaint(android.graphics.Paint);
+    method public static androidx.compose.ui.graphics.Paint asComposePaint(android.graphics.Paint);
   }
 
   public final class AndroidPath implements androidx.compose.ui.graphics.Path {
diff --git a/compose/ui/ui-graphics/api/public_plus_experimental_current.txt b/compose/ui/ui-graphics/api/public_plus_experimental_current.txt
index 6ee15681a7e..4e34ee369cc 100644
--- a/compose/ui/ui-graphics/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-graphics/api/public_plus_experimental_current.txt
@@ -77,7 +77,7 @@ package androidx.compose.ui.graphics {
 
   public final class AndroidPaint_androidKt {
     method public static androidx.compose.ui.graphics.Paint Paint();
-    method public static androidx.compose.ui.graphics.Paint toComposePaint(android.graphics.Paint);
+    method public static androidx.compose.ui.graphics.Paint asComposePaint(android.graphics.Paint);
   }
 
   public final class AndroidPath implements androidx.compose.ui.graphics.Path {
diff --git a/compose/ui/ui-graphics/api/restricted_1.5.0-beta02.txt b/compose/ui/ui-graphics/api/restricted_1.5.0-beta02.txt
index 785b8d7fc77..03668dbb04c 100644
--- a/compose/ui/ui-graphics/api/restricted_1.5.0-beta02.txt
+++ b/compose/ui/ui-graphics/api/restricted_1.5.0-beta02.txt
@@ -107,7 +107,7 @@ package androidx.compose.ui.graphics {
 
   public final class AndroidPaint_androidKt {
     method public static androidx.compose.ui.graphics.Paint Paint();
-    method public static androidx.compose.ui.graphics.Paint toComposePaint(android.graphics.Paint);
+    method public static androidx.compose.ui.graphics.Paint asComposePaint(android.graphics.Paint);
   }
 
   public final class AndroidPath implements androidx.compose.ui.graphics.Path {
diff --git a/compose/ui/ui-graphics/api/restricted_current.ignore b/compose/ui/ui-graphics/api/restricted_current.ignore
new file mode 100644
index 00000000000..dad316bacb5
--- /dev/null
+++ b/compose/ui/ui-graphics/api/restricted_current.ignore
@@ -0,0 +1,3 @@
+// Baseline format: 1.0
+RemovedMethod: androidx.compose.ui.graphics.AndroidPaint_androidKt#toComposePaint(android.graphics.Paint):
+    Removed method androidx.compose.ui.graphics.AndroidPaint_androidKt.toComposePaint(android.graphics.Paint)
diff --git a/compose/ui/ui-graphics/api/restricted_current.txt b/compose/ui/ui-graphics/api/restricted_current.txt
index 785b8d7fc77..03668dbb04c 100644
--- a/compose/ui/ui-graphics/api/restricted_current.txt
+++ b/compose/ui/ui-graphics/api/restricted_current.txt
@@ -107,7 +107,7 @@ package androidx.compose.ui.graphics {
 
   public final class AndroidPaint_androidKt {
     method public static androidx.compose.ui.graphics.Paint Paint();
-    method public static androidx.compose.ui.graphics.Paint toComposePaint(android.graphics.Paint);
+    method public static androidx.compose.ui.graphics.Paint asComposePaint(android.graphics.Paint);
   }
 
   public final class AndroidPath implements androidx.compose.ui.graphics.Path {
diff --git a/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/PaintTest.kt b/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/PaintTest.kt
index 2c61d091d6a..0ed17ef1d2c 100644
--- a/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/PaintTest.kt
+++ b/compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/PaintTest.kt
@@ -66,7 +66,7 @@ class PaintTest {
     @Test
     fun testToComposePaintForColor() {
         val nativePaint = android.graphics.Paint()
-        val composePaint = nativePaint.toComposePaint()
+        val composePaint = nativePaint.asComposePaint()
         composePaint.color = Color(android.graphics.Color.GREEN)
         assertEquals(nativePaint.color, android.graphics.Color.GREEN)
     }
@@ -74,7 +74,7 @@ class PaintTest {
     @Test
     fun testToComposePaintForShader() {
         val nativePaint = android.graphics.Paint()
-        val composePaint = nativePaint.toComposePaint()
+        val composePaint = nativePaint.asComposePaint()
         val green = android.graphics.Color.GREEN
         val red = android.graphics.Color.RED
         val shader = android.graphics.LinearGradient(
diff --git a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidPaint.android.kt b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidPaint.android.kt
index aee6ddb8b87..2f764008576 100644
--- a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidPaint.android.kt
+++ b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidPaint.android.kt
@@ -27,10 +27,19 @@ actual fun Paint(): Paint = AndroidPaint()
 /**
  * Convert an [android.graphics.Paint] instance into a Compose-compatible Paint
  */
-fun android.graphics.Paint.toComposePaint(): Paint = AndroidPaint(this)
+fun android.graphics.Paint.asComposePaint(): Paint = AndroidPaint(this)
 
+/**
+ * Create a Compose [Paint] instance backed by an [android.graphics.Paint] object to be
+ * consumed by Compose applications running on the Android platform
+ *
+ * @param internalPaint [android.graphics.Paint] to be wrapped by the [AndroidPaint] instance
+ */
 class AndroidPaint(private var internalPaint: android.graphics.Paint) : Paint {
 
+    /**
+     * Create a new [AndroidPaint] instance backed by a newly created [android.graphics.Paint]
+     */
     constructor() : this(makeNativePaint())
 
     private var _blendMode = BlendMode.SrcOver
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidTextPaint.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidTextPaint.android.kt
index 7a190acb8c0..cc7c683c71b 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidTextPaint.android.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidTextPaint.android.kt
@@ -28,12 +28,12 @@ import androidx.compose.ui.graphics.PaintingStyle
 import androidx.compose.ui.graphics.ShaderBrush
 import androidx.compose.ui.graphics.Shadow
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.asComposePaint
 import androidx.compose.ui.graphics.drawscope.DrawStyle
 import androidx.compose.ui.graphics.drawscope.Fill
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.graphics.toComposePaint
 import androidx.compose.ui.text.platform.extensions.correctBlurRadius
 import androidx.compose.ui.text.style.TextDecoration
 import kotlin.math.roundToInt
@@ -44,7 +44,7 @@ internal class AndroidTextPaint(flags: Int, density: Float) : TextPaint(flags) {
     }
 
     // A wrapper to use Compose Paint APIs on this TextPaint
-    private val composePaint: Paint = this.toComposePaint()
+    private val composePaint: Paint = this.asComposePaint()
 
     private var textDecoration: TextDecoration = TextDecoration.None