Refactors androidx.compose.ui:ui-text-android to the androidx.compose.ui.text.android package name
Bug: b/160233169
Test: ./gradlew checkApi
Relnote: N/A
Change-Id: I652e12631c47852fe7b0d737f78ff825b65cda00
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt
index 2b8188a..01c1d31 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt
@@ -53,7 +53,7 @@
ComposeInit
}
-@OptIn(androidx.ui.text.platform.InternalPlatformTextApi::class, InternalComposeApi::class)
+@OptIn(androidx.compose.ui.text.android.InternalPlatformTextApi::class, InternalComposeApi::class)
private object ComposeInit {
init {
Library.load("/", "skija")
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt
index 115bf1c..85803438 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt
@@ -103,7 +103,7 @@
}
class Dialog : JDialog, SkiaFrame {
- @OptIn(androidx.ui.text.platform.InternalPlatformTextApi::class)
+ @OptIn(androidx.compose.ui.text.android.InternalPlatformTextApi::class)
companion object {
init {
Library.load("/", "skija")
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/test/TestSkiaWindow.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/test/TestSkiaWindow.kt
index 972e74a..6898f08 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/test/TestSkiaWindow.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/test/TestSkiaWindow.kt
@@ -51,7 +51,7 @@
androidCanvas = android.graphics.Canvas(canvas)
}
- @OptIn(androidx.ui.text.platform.InternalPlatformTextApi::class)
+ @OptIn(androidx.compose.ui.text.android.InternalPlatformTextApi::class)
companion object {
init {
initCompose()
diff --git a/ui/ui-text-android/api/0.1.0-dev16.txt b/ui/ui-text-android/api/0.1.0-dev16.txt
index 9c65639..26d769c 100644
--- a/ui/ui-text-android/api/0.1.0-dev16.txt
+++ b/ui/ui-text-android/api/0.1.0-dev16.txt
@@ -1,5 +1,5 @@
// Signature format: 3.0
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.android {
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalPlatformTextApi {
}
@@ -18,7 +18,7 @@
}
-package androidx.ui.text.platform.style {
+package androidx.compose.ui.text.android.style {
public final class FontWeightStyleSpanKt {
}
diff --git a/ui/ui-text-android/api/current.txt b/ui/ui-text-android/api/current.txt
index 9c65639..26d769c 100644
--- a/ui/ui-text-android/api/current.txt
+++ b/ui/ui-text-android/api/current.txt
@@ -1,5 +1,5 @@
// Signature format: 3.0
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.android {
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalPlatformTextApi {
}
@@ -18,7 +18,7 @@
}
-package androidx.ui.text.platform.style {
+package androidx.compose.ui.text.android.style {
public final class FontWeightStyleSpanKt {
}
diff --git a/ui/ui-text-android/api/public_plus_experimental_0.1.0-dev16.txt b/ui/ui-text-android/api/public_plus_experimental_0.1.0-dev16.txt
index 9c65639..26d769c 100644
--- a/ui/ui-text-android/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/ui/ui-text-android/api/public_plus_experimental_0.1.0-dev16.txt
@@ -1,5 +1,5 @@
// Signature format: 3.0
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.android {
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalPlatformTextApi {
}
@@ -18,7 +18,7 @@
}
-package androidx.ui.text.platform.style {
+package androidx.compose.ui.text.android.style {
public final class FontWeightStyleSpanKt {
}
diff --git a/ui/ui-text-android/api/public_plus_experimental_current.txt b/ui/ui-text-android/api/public_plus_experimental_current.txt
index 9c65639..26d769c 100644
--- a/ui/ui-text-android/api/public_plus_experimental_current.txt
+++ b/ui/ui-text-android/api/public_plus_experimental_current.txt
@@ -1,5 +1,5 @@
// Signature format: 3.0
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.android {
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalPlatformTextApi {
}
@@ -18,7 +18,7 @@
}
-package androidx.ui.text.platform.style {
+package androidx.compose.ui.text.android.style {
public final class FontWeightStyleSpanKt {
}
diff --git a/ui/ui-text-android/api/restricted_0.1.0-dev16.txt b/ui/ui-text-android/api/restricted_0.1.0-dev16.txt
index 9c65639..26d769c 100644
--- a/ui/ui-text-android/api/restricted_0.1.0-dev16.txt
+++ b/ui/ui-text-android/api/restricted_0.1.0-dev16.txt
@@ -1,5 +1,5 @@
// Signature format: 3.0
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.android {
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalPlatformTextApi {
}
@@ -18,7 +18,7 @@
}
-package androidx.ui.text.platform.style {
+package androidx.compose.ui.text.android.style {
public final class FontWeightStyleSpanKt {
}
diff --git a/ui/ui-text-android/api/restricted_current.txt b/ui/ui-text-android/api/restricted_current.txt
index 9c65639..26d769c 100644
--- a/ui/ui-text-android/api/restricted_current.txt
+++ b/ui/ui-text-android/api/restricted_current.txt
@@ -1,5 +1,5 @@
// Signature format: 3.0
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.android {
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalPlatformTextApi {
}
@@ -18,7 +18,7 @@
}
-package androidx.ui.text.platform.style {
+package androidx.compose.ui.text.android.style {
public final class FontWeightStyleSpanKt {
}
diff --git a/ui/ui-text-android/src/androidTest/AndroidManifest.xml b/ui/ui-text-android/src/androidTest/AndroidManifest.xml
index 5077312..e183574 100644
--- a/ui/ui-text-android/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-text-android/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.ui.text.platform.test" />
+<manifest package="androidx.compose.ui.text.android" />
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/BoringLayoutFactoryTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/BoringLayoutFactoryTest.kt
similarity index 97%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/BoringLayoutFactoryTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/BoringLayoutFactoryTest.kt
index ef1b08e..3c52831 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/BoringLayoutFactoryTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/BoringLayoutFactoryTest.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.text.BoringLayout
import android.text.BoringLayout.Metrics
@@ -26,8 +26,8 @@
import android.text.style.ForegroundColorSpan
import android.text.style.LeadingMarginSpan
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.BoringLayoutFactory.create
-import androidx.ui.text.platform.BoringLayoutFactory.measure
+import androidx.compose.ui.text.android.BoringLayoutFactory.create
+import androidx.compose.ui.text.android.BoringLayoutFactory.measure
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutCompatTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutCompatTest.kt
similarity index 98%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutCompatTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutCompatTest.kt
index 2792e60..55623b0 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutCompatTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutCompatTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.os.Build
import android.text.Layout
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutGetHorizontalTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutGetHorizontalTest.kt
similarity index 99%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutGetHorizontalTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutGetHorizontalTest.kt
index 9cd938f..73caa8d 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutGetHorizontalTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutGetHorizontalTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.text.TextDirectionHeuristic
import android.text.TextDirectionHeuristics
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutHelperParagraphTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutHelperParagraphTest.kt
similarity index 98%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutHelperParagraphTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutHelperParagraphTest.kt
index f07fb09..f62beba 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutHelperParagraphTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutHelperParagraphTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.os.Build
import android.text.Layout
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutIntrinsicsTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutIntrinsicsTest.kt
similarity index 98%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutIntrinsicsTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutIntrinsicsTest.kt
index ccbbe4c..f7f5e3f 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/LayoutIntrinsicsTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutIntrinsicsTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.text.BoringLayout
import android.text.SpannableString
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/SegmentBreakerTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/SegmentBreakerTest.kt
similarity index 95%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/SegmentBreakerTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/SegmentBreakerTest.kt
index de6a1be..e122af8 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/SegmentBreakerTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/SegmentBreakerTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.text.TextDirectionHeuristic
import android.text.TextDirectionHeuristics
@@ -23,8 +23,8 @@
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
import androidx.ui.text.font.test.R
-import androidx.ui.text.platform.animation.SegmentBreaker
-import androidx.ui.text.platform.animation.SegmentType
+import androidx.compose.ui.text.android.animation.SegmentBreaker
+import androidx.compose.ui.text.android.animation.SegmentType
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/StaticLayoutFactoryTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/StaticLayoutFactoryTest.kt
similarity index 99%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/StaticLayoutFactoryTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/StaticLayoutFactoryTest.kt
index 2a77129..05f5dda 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/StaticLayoutFactoryTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/StaticLayoutFactoryTest.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.app.Instrumentation
import android.graphics.Typeface
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/TextLayoutSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutSpanTest.kt
similarity index 97%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/TextLayoutSpanTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutSpanTest.kt
index b1fa6af..ddba2d9 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/TextLayoutSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutSpanTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.graphics.Typeface
import android.text.SpannableString
@@ -25,8 +25,8 @@
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
import androidx.ui.text.font.test.R
-import androidx.ui.text.platform.style.BaselineShiftSpan
-import androidx.ui.text.platform.style.SkewXSpan
+import androidx.compose.ui.text.android.style.BaselineShiftSpan
+import androidx.compose.ui.text.android.style.SkewXSpan
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import org.junit.Before
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/TextLayoutTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutTest.kt
similarity index 98%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/TextLayoutTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutTest.kt
index 7fb8808..42b388a 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/TextLayoutTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.graphics.Typeface
import android.text.BoringLayout
@@ -27,7 +27,7 @@
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
import androidx.ui.text.font.test.R
-import androidx.ui.text.platform.style.BaselineShiftSpan
+import androidx.compose.ui.text.android.style.BaselineShiftSpan
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Test
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/animation/SegmentBreakerBreakSegmentTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/animation/SegmentBreakerBreakSegmentTest.kt
similarity index 99%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/animation/SegmentBreakerBreakSegmentTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/animation/SegmentBreakerBreakSegmentTest.kt
index 687c1d4..5b9e3ee 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/animation/SegmentBreakerBreakSegmentTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/animation/SegmentBreakerBreakSegmentTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.animation
+package androidx.compose.ui.text.android.animation
import android.text.TextDirectionHeuristic
import android.text.TextDirectionHeuristics
@@ -23,9 +23,9 @@
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
import androidx.ui.text.font.test.R
-import androidx.ui.text.platform.InternalPlatformTextApi
-import androidx.ui.text.platform.LayoutHelper
-import androidx.ui.text.platform.StaticLayoutFactory
+import androidx.compose.ui.text.android.InternalPlatformTextApi
+import androidx.compose.ui.text.android.LayoutHelper
+import androidx.compose.ui.text.android.StaticLayoutFactory
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/selection/WordBoundaryTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/selection/WordBoundaryTest.kt
similarity index 98%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/selection/WordBoundaryTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/selection/WordBoundaryTest.kt
index 10ad385..3181c68 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/selection/WordBoundaryTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/selection/WordBoundaryTest.kt
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.selection
+package androidx.compose.ui.text.android.selection
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/selection/WordIteratorTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/selection/WordIteratorTest.kt
similarity index 99%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/selection/WordIteratorTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/selection/WordIteratorTest.kt
index 226ccb8..412730e 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/selection/WordIteratorTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/selection/WordIteratorTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.selection
+package androidx.compose.ui.text.android.selection
import androidx.test.filters.SmallTest
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/BaselineShiftSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/BaselineShiftSpanTest.kt
similarity index 93%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/BaselineShiftSpanTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/BaselineShiftSpanTest.kt
index 982d10a..1d71d79 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/BaselineShiftSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/BaselineShiftSpanTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/FontFeatureSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/FontFeatureSpanTest.kt
similarity index 94%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/FontFeatureSpanTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/FontFeatureSpanTest.kt
index 747972b..56e775d 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/FontFeatureSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/FontFeatureSpanTest.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import com.google.common.truth.Truth
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/FontSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/FontSpanTest.kt
similarity index 91%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/FontSpanTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/FontSpanTest.kt
index 747ce19..2a99acd64 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/FontSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/FontSpanTest.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.graphics.Typeface
import android.text.TextPaint
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/FontWeightStyleSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/FontWeightStyleSpanTest.kt
similarity index 98%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/FontWeightStyleSpanTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/FontWeightStyleSpanTest.kt
index e0f9693..7e6a59a 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/FontWeightStyleSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/FontWeightStyleSpanTest.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.graphics.Typeface
import android.graphics.fonts.FontStyle
import android.text.TextPaint
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanEmTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/LetterSpacingSpanEmTest.kt
similarity index 92%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanEmTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/LetterSpacingSpanEmTest.kt
index a423f9a..707867c7 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanEmTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/LetterSpacingSpanEmTest.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import com.google.common.truth.Truth
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanPxTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/LetterSpacingSpanPxTest.kt
similarity index 96%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanPxTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/LetterSpacingSpanPxTest.kt
index e30f9d3..0d48e64 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanPxTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/LetterSpacingSpanPxTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.doReturn
import com.nhaarman.mockitokotlin2.mock
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/PlaceholderSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/PlaceholderSpanTest.kt
similarity index 99%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/PlaceholderSpanTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/PlaceholderSpanTest.kt
index 04dc605..1ef8f8e 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/PlaceholderSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/PlaceholderSpanTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.graphics.Paint
import android.text.TextPaint
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import androidx.test.filters.SmallTest
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/ShadowSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/ShadowSpanTest.kt
similarity index 92%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/ShadowSpanTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/ShadowSpanTest.kt
index 2518d8e..51558d7 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/ShadowSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/ShadowSpanTest.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/SkewXSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/SkewXSpanTest.kt
similarity index 92%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/SkewXSpanTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/SkewXSpanTest.kt
index dcc02df..b62b398 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/SkewXSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/SkewXSpanTest.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import com.google.common.truth.Truth
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/TypefaceSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/TypefaceSpanTest.kt
similarity index 93%
rename from ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/TypefaceSpanTest.kt
rename to ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/TypefaceSpanTest.kt
index 11d6009..5807061 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/ui/text/platform/style/TypefaceSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/style/TypefaceSpanTest.kt
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.graphics.Typeface
import android.text.TextPaint
import androidx.test.filters.SmallTest
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import com.google.common.truth.Truth
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/main/AndroidManifest.xml b/ui/ui-text-android/src/main/AndroidManifest.xml
index c7bd444..e183574 100644
--- a/ui/ui-text-android/src/main/AndroidManifest.xml
+++ b/ui/ui-text-android/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.ui.text.platform" />
+<manifest package="androidx.compose.ui.text.android" />
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/BoringLayoutFactory.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/BoringLayoutFactory.kt
similarity index 98%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/BoringLayoutFactory.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/BoringLayoutFactory.kt
index 210dba6..f4300cb 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/BoringLayoutFactory.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/BoringLayoutFactory.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.text.BoringLayout
import android.text.BoringLayout.Metrics
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/CharSequenceCharacterIterator.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/CharSequenceCharacterIterator.kt
similarity index 98%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/CharSequenceCharacterIterator.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/CharSequenceCharacterIterator.kt
index 1307d6f..b1fc875 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/CharSequenceCharacterIterator.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/CharSequenceCharacterIterator.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import java.text.CharacterIterator
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/InternalPlatformTextApi.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/InternalPlatformTextApi.kt
similarity index 95%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/InternalPlatformTextApi.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/InternalPlatformTextApi.kt
index b0b6832..d87011e 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/InternalPlatformTextApi.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/InternalPlatformTextApi.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
@RequiresOptIn(
level = RequiresOptIn.Level.ERROR,
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/LayoutCompat.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/LayoutCompat.kt
similarity index 98%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/LayoutCompat.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/LayoutCompat.kt
index 4b9e4d0..015f6a1 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/LayoutCompat.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/LayoutCompat.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.graphics.text.LineBreaker
import android.text.Layout
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/LayoutHelper.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/LayoutHelper.kt
similarity index 99%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/LayoutHelper.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/LayoutHelper.kt
index c9ef027..3f2bad5 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/LayoutHelper.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/LayoutHelper.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.text.Layout
import android.text.TextUtils
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/LayoutIntrinsics.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/LayoutIntrinsics.kt
similarity index 96%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/LayoutIntrinsics.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/LayoutIntrinsics.kt
index ec8951b..35dc84c 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/LayoutIntrinsics.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/LayoutIntrinsics.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.text.BoringLayout
import android.text.Layout
@@ -45,7 +45,7 @@
/**
* Calculate minimum intrinsic width of the CharSequence.
*
- * @see androidx.ui.text.platform.minIntrinsicWidth
+ * @see androidx.compose.ui.text.android.minIntrinsicWidth
*/
val minIntrinsicWidth: Float by lazy {
minIntrinsicWidth(charSequence, textPaint)
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/StaticLayoutFactory.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt
similarity index 96%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/StaticLayoutFactory.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt
index 6921147..26128c9 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/StaticLayoutFactory.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/StaticLayoutFactory.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.os.Build
import android.text.Layout.Alignment
@@ -25,9 +25,9 @@
import android.util.Log
import androidx.annotation.FloatRange
import androidx.annotation.IntRange
-import androidx.ui.text.platform.LayoutCompat.BreakStrategy
-import androidx.ui.text.platform.LayoutCompat.HyphenationFrequency
-import androidx.ui.text.platform.LayoutCompat.JustificationMode
+import androidx.compose.ui.text.android.LayoutCompat.BreakStrategy
+import androidx.compose.ui.text.android.LayoutCompat.HyphenationFrequency
+import androidx.compose.ui.text.android.LayoutCompat.JustificationMode
import java.lang.reflect.Constructor
import java.lang.reflect.InvocationTargetException
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/TextLayout.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/TextLayout.kt
similarity index 86%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/TextLayout.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/TextLayout.kt
index b5ed4a9..a35797e 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/TextLayout.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/TextLayout.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.android
import android.graphics.Canvas
import android.graphics.Path
@@ -26,31 +26,31 @@
import androidx.annotation.Px
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
-import androidx.ui.text.platform.LayoutCompat.ALIGN_CENTER
-import androidx.ui.text.platform.LayoutCompat.ALIGN_LEFT
-import androidx.ui.text.platform.LayoutCompat.ALIGN_NORMAL
-import androidx.ui.text.platform.LayoutCompat.ALIGN_OPPOSITE
-import androidx.ui.text.platform.LayoutCompat.ALIGN_RIGHT
-import androidx.ui.text.platform.LayoutCompat.BreakStrategy
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_ALIGNMENT
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_BREAK_STRATEGY
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_HYPHENATION_FREQUENCY
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_INCLUDE_PADDING
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_JUSTIFICATION_MODE
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_LINESPACING_EXTRA
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_LINESPACING_MULTIPLIER
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_TEXT_DIRECTION
-import androidx.ui.text.platform.LayoutCompat.HyphenationFrequency
-import androidx.ui.text.platform.LayoutCompat.JustificationMode
-import androidx.ui.text.platform.LayoutCompat.TEXT_DIRECTION_ANY_RTL_LTR
-import androidx.ui.text.platform.LayoutCompat.TEXT_DIRECTION_FIRST_STRONG_LTR
-import androidx.ui.text.platform.LayoutCompat.TEXT_DIRECTION_FIRST_STRONG_RTL
-import androidx.ui.text.platform.LayoutCompat.TEXT_DIRECTION_LOCALE
-import androidx.ui.text.platform.LayoutCompat.TEXT_DIRECTION_LTR
-import androidx.ui.text.platform.LayoutCompat.TEXT_DIRECTION_RTL
-import androidx.ui.text.platform.LayoutCompat.TextDirection
-import androidx.ui.text.platform.LayoutCompat.TextLayoutAlignment
-import androidx.ui.text.platform.style.BaselineShiftSpan
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_CENTER
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_LEFT
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_NORMAL
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_OPPOSITE
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_RIGHT
+import androidx.compose.ui.text.android.LayoutCompat.BreakStrategy
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_ALIGNMENT
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_BREAK_STRATEGY
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_HYPHENATION_FREQUENCY
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_INCLUDE_PADDING
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_JUSTIFICATION_MODE
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINESPACING_EXTRA
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINESPACING_MULTIPLIER
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_TEXT_DIRECTION
+import androidx.compose.ui.text.android.LayoutCompat.HyphenationFrequency
+import androidx.compose.ui.text.android.LayoutCompat.JustificationMode
+import androidx.compose.ui.text.android.LayoutCompat.TEXT_DIRECTION_ANY_RTL_LTR
+import androidx.compose.ui.text.android.LayoutCompat.TEXT_DIRECTION_FIRST_STRONG_LTR
+import androidx.compose.ui.text.android.LayoutCompat.TEXT_DIRECTION_FIRST_STRONG_RTL
+import androidx.compose.ui.text.android.LayoutCompat.TEXT_DIRECTION_LOCALE
+import androidx.compose.ui.text.android.LayoutCompat.TEXT_DIRECTION_LTR
+import androidx.compose.ui.text.android.LayoutCompat.TEXT_DIRECTION_RTL
+import androidx.compose.ui.text.android.LayoutCompat.TextDirection
+import androidx.compose.ui.text.android.LayoutCompat.TextLayoutAlignment
+import androidx.compose.ui.text.android.style.BaselineShiftSpan
import kotlin.math.ceil
import kotlin.math.min
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/animation/SegmentBreaker.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt
similarity index 97%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/animation/SegmentBreaker.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt
index edb0081..e54fb1b 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/animation/SegmentBreaker.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/animation/SegmentBreaker.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.animation
+package androidx.compose.ui.text.android.animation
import android.text.Layout
-import androidx.ui.text.platform.CharSequenceCharacterIterator
-import androidx.ui.text.platform.InternalPlatformTextApi
-import androidx.ui.text.platform.LayoutHelper
-import androidx.ui.text.platform.getLineForOffset
+import androidx.compose.ui.text.android.CharSequenceCharacterIterator
+import androidx.compose.ui.text.android.InternalPlatformTextApi
+import androidx.compose.ui.text.android.LayoutHelper
+import androidx.compose.ui.text.android.getLineForOffset
import java.text.BreakIterator
import java.util.Locale
import kotlin.math.ceil
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/animation/SegmentType.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/animation/SegmentType.kt
similarity index 91%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/animation/SegmentType.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/animation/SegmentType.kt
index 70bb52a..eac7729 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/animation/SegmentType.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/animation/SegmentType.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.animation
+package androidx.compose.ui.text.android.animation
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* Defines a segmentation rule for text animation
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/selection/WordBoundary.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/selection/WordBoundary.kt
similarity index 96%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/selection/WordBoundary.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/selection/WordBoundary.kt
index f246d07..563844b 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/selection/WordBoundary.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/selection/WordBoundary.kt
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.selection
+package androidx.compose.ui.text.android.selection
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import java.text.BreakIterator
import java.util.Locale
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/selection/WordIterator.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/selection/WordIterator.kt
similarity index 98%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/selection/WordIterator.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/selection/WordIterator.kt
index 20d818a..da44294 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/selection/WordIterator.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/selection/WordIterator.kt
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.selection
+package androidx.compose.ui.text.android.selection
-import androidx.ui.text.platform.CharSequenceCharacterIterator
+import androidx.compose.ui.text.android.CharSequenceCharacterIterator
import java.text.BreakIterator
import java.util.Locale
import kotlin.math.max
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/BaselineShiftSpan.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/BaselineShiftSpan.kt
similarity index 91%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/BaselineShiftSpan.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/BaselineShiftSpan.kt
index bfc734b..d46c285 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/BaselineShiftSpan.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/BaselineShiftSpan.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import kotlin.math.ceil
import android.text.TextPaint
import android.text.style.MetricAffectingSpan
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* Span which shifts the vertical position of baseline.
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/FontFeatureSpan.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/FontFeatureSpan.kt
similarity index 90%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/FontFeatureSpan.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/FontFeatureSpan.kt
index e6c66fb..71a0288 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/FontFeatureSpan.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/FontFeatureSpan.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import android.text.style.MetricAffectingSpan
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* Span that change font feature settings for font.
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/FontSpan.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/FontSpan.kt
similarity index 94%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/FontSpan.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/FontSpan.kt
index 1c59a60..e062b1a 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/FontSpan.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/FontSpan.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.graphics.Typeface
import android.graphics.fonts.FontStyle
@@ -22,7 +22,7 @@
import android.text.TextPaint
import android.text.style.MetricAffectingSpan
import androidx.annotation.VisibleForTesting
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* Span that changes the typeface of the text.
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/FontWeightStyleSpan.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/FontWeightStyleSpan.kt
similarity index 97%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/FontWeightStyleSpan.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/FontWeightStyleSpan.kt
index 97f2e6b..27f88e6 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/FontWeightStyleSpan.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/FontWeightStyleSpan.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.graphics.Typeface
import android.graphics.fonts.FontStyle
@@ -25,7 +25,7 @@
import androidx.annotation.IntRange
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
private const val AndroidBoldWeight = 600
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanEm.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/LetterSpacingSpanEm.kt
similarity index 90%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanEm.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/LetterSpacingSpanEm.kt
index 167b4e1..aae4ecd 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanEm.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/LetterSpacingSpanEm.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import android.text.style.MetricAffectingSpan
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* Span used to adjust the letter spacing, in the unit of Em.
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanPx.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/LetterSpacingSpanPx.kt
similarity index 88%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanPx.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/LetterSpacingSpanPx.kt
index 9d2bbbd..b6caa39 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanPx.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/LetterSpacingSpanPx.kt
@@ -1,9 +1,9 @@
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import android.text.style.MetricAffectingSpan
import androidx.annotation.Px
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* Span that sets the letter spacing as [letterSpacing], in the unit of pixel.
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/LineHeightSpan.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/LineHeightSpan.kt
similarity index 94%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/LineHeightSpan.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/LineHeightSpan.kt
index 1a75332..d2ab8e8 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/LineHeightSpan.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/LineHeightSpan.kt
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.graphics.Paint.FontMetricsInt
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* The span which modifies the height of the covered paragraphs. A paragraph is defined as a
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/PlaceholderSpan.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/PlaceholderSpan.kt
similarity index 97%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/PlaceholderSpan.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/PlaceholderSpan.kt
index edb14d7..6f675dd 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/PlaceholderSpan.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/PlaceholderSpan.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.annotation.SuppressLint
import android.graphics.Canvas
import android.graphics.Paint
import android.text.style.ReplacementSpan
import androidx.annotation.IntDef
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import java.lang.IllegalArgumentException
import kotlin.math.ceil
import kotlin.math.max
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/ShadowSpan.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/ShadowSpan.kt
similarity index 90%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/ShadowSpan.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/ShadowSpan.kt
index 4966bc9..2f65ef0 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/ShadowSpan.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/ShadowSpan.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import android.text.style.CharacterStyle
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* A span which applies a shadow effect to the covered text.
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/SkewXSpan.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/SkewXSpan.kt
similarity index 91%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/SkewXSpan.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/SkewXSpan.kt
index 59f5f06..e2b3da0 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/SkewXSpan.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/SkewXSpan.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.text.TextPaint
import android.text.style.MetricAffectingSpan
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* Span which shear text in x direction. A pixel at (x, y) will be transfer to (x + y * skewX, y),
diff --git a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/TypefaceSpan.kt b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/TypefaceSpan.kt
similarity index 93%
rename from ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/TypefaceSpan.kt
rename to ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/TypefaceSpan.kt
index f38f158..5448b81 100644
--- a/ui/ui-text-android/src/main/java/androidx/ui/text/platform/style/TypefaceSpan.kt
+++ b/ui/ui-text-android/src/main/java/androidx/compose/ui/text/android/style/TypefaceSpan.kt
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform.style
+package androidx.compose.ui.text.android.style
import android.graphics.Paint
import android.graphics.Typeface
import android.text.TextPaint
import android.text.style.MetricAffectingSpan
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
/**
* Span that displays text in the given Typeface. In Android Framework, TypefaceSpan that accepts
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTest.kt
index 48c0376..c3e2c3e 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTest.kt
@@ -11,6 +11,8 @@
import android.text.style.ScaleXSpan
import android.text.style.StrikethroughSpan
import android.text.style.UnderlineSpan
+import androidx.compose.ui.text.android.InternalPlatformTextApi
+import androidx.compose.ui.text.android.TextLayout
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
import androidx.ui.geometry.Offset
@@ -30,13 +32,13 @@
import androidx.ui.text.font.FontWeight
import androidx.ui.text.font.asFontFamily
import androidx.ui.text.matchers.assertThat
-import androidx.ui.text.platform.style.BaselineShiftSpan
-import androidx.ui.text.platform.style.FontFeatureSpan
-import androidx.ui.text.platform.style.FontSpan
-import androidx.ui.text.platform.style.LetterSpacingSpanEm
-import androidx.ui.text.platform.style.LetterSpacingSpanPx
-import androidx.ui.text.platform.style.ShadowSpan
-import androidx.ui.text.platform.style.SkewXSpan
+import androidx.compose.ui.text.android.style.BaselineShiftSpan
+import androidx.compose.ui.text.android.style.FontFeatureSpan
+import androidx.compose.ui.text.android.style.FontSpan
+import androidx.compose.ui.text.android.style.LetterSpacingSpanEm
+import androidx.compose.ui.text.android.style.LetterSpacingSpanPx
+import androidx.compose.ui.text.android.style.ShadowSpan
+import androidx.compose.ui.text.android.style.SkewXSpan
import androidx.ui.text.style.BaselineShift
import androidx.ui.text.style.TextAlign
import androidx.ui.text.style.TextDecoration
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTextDirectionTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTextDirectionTest.kt
index f072c75..6c1e7d0 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTextDirectionTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTextDirectionTest.kt
@@ -16,6 +16,8 @@
package androidx.ui.text.platform
+import androidx.compose.ui.text.android.InternalPlatformTextApi
+import androidx.compose.ui.text.android.LayoutCompat
import androidx.test.filters.SmallTest
import androidx.ui.intl.LocaleList
import androidx.ui.text.style.TextDirection
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TextTestExtensions.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TextTestExtensions.kt
index d371fe8..e686786 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TextTestExtensions.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TextTestExtensions.kt
@@ -21,6 +21,8 @@
import android.graphics.Typeface
import android.text.Layout
import android.text.TextPaint
+import androidx.compose.ui.text.android.InternalPlatformTextApi
+import androidx.compose.ui.text.android.TextLayout
import kotlin.math.ceil
internal fun AndroidParagraph.bitmap(): Bitmap {
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraph.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraph.kt
index af00d7f..c6dfc09 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraph.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraph.kt
@@ -18,6 +18,7 @@
import android.text.Spanned
import android.text.TextPaint
import android.text.TextUtils
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Path
@@ -31,17 +32,18 @@
import androidx.ui.text.TextRange
import androidx.ui.text.TextStyle
import androidx.ui.text.font.Font
-import androidx.ui.text.platform.LayoutCompat.ALIGN_CENTER
-import androidx.ui.text.platform.LayoutCompat.ALIGN_LEFT
-import androidx.ui.text.platform.LayoutCompat.ALIGN_NORMAL
-import androidx.ui.text.platform.LayoutCompat.ALIGN_OPPOSITE
-import androidx.ui.text.platform.LayoutCompat.ALIGN_RIGHT
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_ALIGNMENT
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_JUSTIFICATION_MODE
-import androidx.ui.text.platform.LayoutCompat.DEFAULT_LINESPACING_MULTIPLIER
-import androidx.ui.text.platform.LayoutCompat.JUSTIFICATION_MODE_INTER_WORD
-import androidx.ui.text.platform.selection.WordBoundary
-import androidx.ui.text.platform.style.PlaceholderSpan
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_CENTER
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_LEFT
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_NORMAL
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_OPPOSITE
+import androidx.compose.ui.text.android.LayoutCompat.ALIGN_RIGHT
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_ALIGNMENT
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_JUSTIFICATION_MODE
+import androidx.compose.ui.text.android.LayoutCompat.DEFAULT_LINESPACING_MULTIPLIER
+import androidx.compose.ui.text.android.LayoutCompat.JUSTIFICATION_MODE_INTER_WORD
+import androidx.compose.ui.text.android.TextLayout
+import androidx.compose.ui.text.android.selection.WordBoundary
+import androidx.compose.ui.text.android.style.PlaceholderSpan
import androidx.ui.text.style.TextAlign
import androidx.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Density
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphHelper.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphHelper.kt
index 6b12724..32a5b42 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphHelper.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphHelper.kt
@@ -17,6 +17,7 @@
package androidx.ui.text.platform
import android.text.SpannableString
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import androidx.ui.text.AnnotatedString
import androidx.ui.text.Placeholder
import androidx.ui.text.SpanStyle
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt
index 1277b38..f4b1eb7 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt
@@ -18,6 +18,9 @@
import android.graphics.Paint
import android.text.TextPaint
+import androidx.compose.ui.text.android.InternalPlatformTextApi
+import androidx.compose.ui.text.android.LayoutCompat
+import androidx.compose.ui.text.android.LayoutIntrinsics
import androidx.core.text.TextUtilsCompat
import androidx.core.view.ViewCompat
import androidx.ui.intl.AndroidLocale
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/PlaceholderExtensions.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/PlaceholderExtensions.kt
index 45a5674..8a829ce 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/PlaceholderExtensions.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/PlaceholderExtensions.kt
@@ -20,8 +20,8 @@
import androidx.ui.text.AnnotatedString
import androidx.ui.text.Placeholder
import androidx.ui.text.PlaceholderVerticalAlign
-import androidx.ui.text.platform.InternalPlatformTextApi
-import androidx.ui.text.platform.style.PlaceholderSpan
+import androidx.compose.ui.text.android.InternalPlatformTextApi
+import androidx.compose.ui.text.android.style.PlaceholderSpan
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
import androidx.ui.unit.TextUnitType
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/SpannableExtensions.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/SpannableExtensions.kt
index 17387cc..8fb5d96 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/SpannableExtensions.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/SpannableExtensions.kt
@@ -42,17 +42,17 @@
import androidx.ui.text.font.FontStyle
import androidx.ui.text.font.FontSynthesis
import androidx.ui.text.font.FontWeight
-import androidx.ui.text.platform.InternalPlatformTextApi
+import androidx.compose.ui.text.android.InternalPlatformTextApi
import androidx.ui.text.platform.TypefaceAdapter
-import androidx.ui.text.platform.style.BaselineShiftSpan
-import androidx.ui.text.platform.style.FontFeatureSpan
-import androidx.ui.text.platform.style.FontSpan
-import androidx.ui.text.platform.style.FontWeightStyleSpan
-import androidx.ui.text.platform.style.LetterSpacingSpanEm
-import androidx.ui.text.platform.style.LetterSpacingSpanPx
-import androidx.ui.text.platform.style.LineHeightSpan
-import androidx.ui.text.platform.style.ShadowSpan
-import androidx.ui.text.platform.style.SkewXSpan
+import androidx.compose.ui.text.android.style.BaselineShiftSpan
+import androidx.compose.ui.text.android.style.FontFeatureSpan
+import androidx.compose.ui.text.android.style.FontSpan
+import androidx.compose.ui.text.android.style.FontWeightStyleSpan
+import androidx.compose.ui.text.android.style.LetterSpacingSpanEm
+import androidx.compose.ui.text.android.style.LetterSpacingSpanPx
+import androidx.compose.ui.text.android.style.LineHeightSpan
+import androidx.compose.ui.text.android.style.ShadowSpan
+import androidx.compose.ui.text.android.style.SkewXSpan
import androidx.ui.text.style.BaselineShift
import androidx.ui.text.style.TextDecoration
import androidx.ui.text.style.TextGeometricTransform