Merge "Change ui-android-text package name" into androidx-master-dev

45 files changed, 119 insertions, 178 deletions

diff --git a/ui/ui-android-text/api/0.1.0-dev09.txt b/ui/ui-android-text/api/0.1.0-dev09.txt
index 9c052f39c05..756ead2fa7b 100644
--- a/ui/ui-android-text/api/0.1.0-dev09.txt
+++ b/ui/ui-android-text/api/0.1.0-dev09.txt
@@ -1,5 +1,5 @@
 // Signature format: 3.0
-package androidx.text {
+package androidx.ui.text.platform {
 
   public final class LayoutIntrinsicsKt {
   }
@@ -9,7 +9,7 @@ package androidx.text {
 
 }
 
-package androidx.text.style {
+package androidx.ui.text.platform.style {
 
   public final class PlaceholderSpanKt {
   }
diff --git a/ui/ui-android-text/api/current.txt b/ui/ui-android-text/api/current.txt
index 9c052f39c05..756ead2fa7b 100644
--- a/ui/ui-android-text/api/current.txt
+++ b/ui/ui-android-text/api/current.txt
@@ -1,5 +1,5 @@
 // Signature format: 3.0
-package androidx.text {
+package androidx.ui.text.platform {
 
   public final class LayoutIntrinsicsKt {
   }
@@ -9,7 +9,7 @@ package androidx.text {
 
 }
 
-package androidx.text.style {
+package androidx.ui.text.platform.style {
 
   public final class PlaceholderSpanKt {
   }
diff --git a/ui/ui-android-text/api/public_plus_experimental_0.1.0-dev09.txt b/ui/ui-android-text/api/public_plus_experimental_0.1.0-dev09.txt
index 7e873270aaf..756ead2fa7b 100644
--- a/ui/ui-android-text/api/public_plus_experimental_0.1.0-dev09.txt
+++ b/ui/ui-android-text/api/public_plus_experimental_0.1.0-dev09.txt
@@ -1,5 +1,5 @@
 // Signature format: 3.0
-package androidx.text {
+package androidx.ui.text.platform {
 
   public final class LayoutIntrinsicsKt {
   }
@@ -9,34 +9,7 @@ package androidx.text {
 
 }
 
-package androidx.text.style {
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class PlaceholderSpan extends android.text.style.ReplacementSpan {
-    ctor public PlaceholderSpan(float width, int widthUnit, float height, int heightUnit, float pxPerSp, int verticalAlign);
-    method public void draw(android.graphics.Canvas canvas, CharSequence? text, int start, int end, float x, int top, int y, int bottom, android.graphics.Paint paint);
-    method public android.graphics.Paint.FontMetricsInt getFontMetrics();
-    method public int getHeightPx();
-    method public int getSize(android.graphics.Paint paint, CharSequence? text, int start, int end, android.graphics.Paint.FontMetricsInt? fm);
-    method public int getVerticalAlign();
-    method public int getWidthPx();
-    property public final android.graphics.Paint.FontMetricsInt fontMetrics;
-    property public final int heightPx;
-    property public final int widthPx;
-    field public static final int ALIGN_ABOVE_BASELINE = 0; // 0x0
-    field public static final int ALIGN_BOTTOM = 2; // 0x2
-    field public static final int ALIGN_CENTER = 3; // 0x3
-    field public static final int ALIGN_TEXT_BOTTOM = 5; // 0x5
-    field public static final int ALIGN_TEXT_CENTER = 6; // 0x6
-    field public static final int ALIGN_TEXT_TOP = 4; // 0x4
-    field public static final int ALIGN_TOP = 1; // 0x1
-    field public static final androidx.text.style.PlaceholderSpan.Companion! Companion;
-    field public static final int UNIT_EM = 1; // 0x1
-    field public static final int UNIT_INHERIT = 2; // 0x2
-    field public static final int UNIT_SP = 0; // 0x0
-  }
-
-  public static final class PlaceholderSpan.Companion {
-  }
+package androidx.ui.text.platform.style {
 
   public final class PlaceholderSpanKt {
   }
diff --git a/ui/ui-android-text/api/public_plus_experimental_current.txt b/ui/ui-android-text/api/public_plus_experimental_current.txt
index 7e873270aaf..756ead2fa7b 100644
--- a/ui/ui-android-text/api/public_plus_experimental_current.txt
+++ b/ui/ui-android-text/api/public_plus_experimental_current.txt
@@ -1,5 +1,5 @@
 // Signature format: 3.0
-package androidx.text {
+package androidx.ui.text.platform {
 
   public final class LayoutIntrinsicsKt {
   }
@@ -9,34 +9,7 @@ package androidx.text {
 
 }
 
-package androidx.text.style {
-
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class PlaceholderSpan extends android.text.style.ReplacementSpan {
-    ctor public PlaceholderSpan(float width, int widthUnit, float height, int heightUnit, float pxPerSp, int verticalAlign);
-    method public void draw(android.graphics.Canvas canvas, CharSequence? text, int start, int end, float x, int top, int y, int bottom, android.graphics.Paint paint);
-    method public android.graphics.Paint.FontMetricsInt getFontMetrics();
-    method public int getHeightPx();
-    method public int getSize(android.graphics.Paint paint, CharSequence? text, int start, int end, android.graphics.Paint.FontMetricsInt? fm);
-    method public int getVerticalAlign();
-    method public int getWidthPx();
-    property public final android.graphics.Paint.FontMetricsInt fontMetrics;
-    property public final int heightPx;
-    property public final int widthPx;
-    field public static final int ALIGN_ABOVE_BASELINE = 0; // 0x0
-    field public static final int ALIGN_BOTTOM = 2; // 0x2
-    field public static final int ALIGN_CENTER = 3; // 0x3
-    field public static final int ALIGN_TEXT_BOTTOM = 5; // 0x5
-    field public static final int ALIGN_TEXT_CENTER = 6; // 0x6
-    field public static final int ALIGN_TEXT_TOP = 4; // 0x4
-    field public static final int ALIGN_TOP = 1; // 0x1
-    field public static final androidx.text.style.PlaceholderSpan.Companion! Companion;
-    field public static final int UNIT_EM = 1; // 0x1
-    field public static final int UNIT_INHERIT = 2; // 0x2
-    field public static final int UNIT_SP = 0; // 0x0
-  }
-
-  public static final class PlaceholderSpan.Companion {
-  }
+package androidx.ui.text.platform.style {
 
   public final class PlaceholderSpanKt {
   }
diff --git a/ui/ui-android-text/api/restricted_0.1.0-dev09.txt b/ui/ui-android-text/api/restricted_0.1.0-dev09.txt
index 938a6f4a193..7d5f536b105 100644
--- a/ui/ui-android-text/api/restricted_0.1.0-dev09.txt
+++ b/ui/ui-android-text/api/restricted_0.1.0-dev09.txt
@@ -1,5 +1,5 @@
 // Signature format: 3.0
-package androidx.text {
+package androidx.ui.text.platform {
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LayoutIntrinsics {
     ctor public LayoutIntrinsics(CharSequence charSequence, android.text.TextPaint textPaint, int textDirectionHeuristic);
@@ -15,11 +15,11 @@ package androidx.text {
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TextLayout {
-    ctor public TextLayout(CharSequence charSequence, float width, android.text.TextPaint textPaint, int alignment, android.text.TextUtils.TruncateAt? ellipsize, int textDirectionHeuristic, float lineSpacingMultiplier, @Px float lineSpacingExtra, boolean includePadding, int maxLines, int breakStrategy, int hyphenationFrequency, int justificationMode, int[]? leftIndents, int[]? rightIndents, androidx.text.LayoutIntrinsics layoutIntrinsics);
+    ctor public TextLayout(CharSequence charSequence, float width, android.text.TextPaint textPaint, int alignment, android.text.TextUtils.TruncateAt? ellipsize, int textDirectionHeuristic, float lineSpacingMultiplier, @Px float lineSpacingExtra, boolean includePadding, int maxLines, int breakStrategy, int hyphenationFrequency, int justificationMode, int[]? leftIndents, int[]? rightIndents, androidx.ui.text.platform.LayoutIntrinsics layoutIntrinsics);
     method public boolean getDidExceedMaxLines();
     method public int getHeight();
     method public android.text.Layout getLayout();
-    method public androidx.text.LayoutIntrinsics getLayoutIntrinsics();
+    method public androidx.ui.text.platform.LayoutIntrinsics getLayoutIntrinsics();
     method public float getLineBaseline(int line);
     method public float getLineBottom(int line);
     method public int getLineCount();
@@ -55,7 +55,7 @@ package androidx.text {
 
 }
 
-package androidx.text.selection {
+package androidx.ui.text.platform.selection {
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class WordBoundary {
     ctor public WordBoundary(java.util.Locale locale, CharSequence text);
@@ -65,7 +65,7 @@ package androidx.text.selection {
 
 }
 
-package androidx.text.style {
+package androidx.ui.text.platform.style {
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class BaselineShiftSpan extends android.text.style.MetricAffectingSpan {
     ctor public BaselineShiftSpan(float multiplier);
@@ -119,7 +119,7 @@ package androidx.text.style {
     field public static final int ALIGN_TEXT_CENTER = 6; // 0x6
     field public static final int ALIGN_TEXT_TOP = 4; // 0x4
     field public static final int ALIGN_TOP = 1; // 0x1
-    field public static final androidx.text.style.PlaceholderSpan.Companion! Companion;
+    field public static final androidx.ui.text.platform.style.PlaceholderSpan.Companion! Companion;
     field public static final int UNIT_EM = 1; // 0x1
     field public static final int UNIT_INHERIT = 2; // 0x2
     field public static final int UNIT_SP = 0; // 0x0
diff --git a/ui/ui-android-text/api/restricted_current.txt b/ui/ui-android-text/api/restricted_current.txt
index 938a6f4a193..7d5f536b105 100644
--- a/ui/ui-android-text/api/restricted_current.txt
+++ b/ui/ui-android-text/api/restricted_current.txt
@@ -1,5 +1,5 @@
 // Signature format: 3.0
-package androidx.text {
+package androidx.ui.text.platform {
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LayoutIntrinsics {
     ctor public LayoutIntrinsics(CharSequence charSequence, android.text.TextPaint textPaint, int textDirectionHeuristic);
@@ -15,11 +15,11 @@ package androidx.text {
   }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TextLayout {
-    ctor public TextLayout(CharSequence charSequence, float width, android.text.TextPaint textPaint, int alignment, android.text.TextUtils.TruncateAt? ellipsize, int textDirectionHeuristic, float lineSpacingMultiplier, @Px float lineSpacingExtra, boolean includePadding, int maxLines, int breakStrategy, int hyphenationFrequency, int justificationMode, int[]? leftIndents, int[]? rightIndents, androidx.text.LayoutIntrinsics layoutIntrinsics);
+    ctor public TextLayout(CharSequence charSequence, float width, android.text.TextPaint textPaint, int alignment, android.text.TextUtils.TruncateAt? ellipsize, int textDirectionHeuristic, float lineSpacingMultiplier, @Px float lineSpacingExtra, boolean includePadding, int maxLines, int breakStrategy, int hyphenationFrequency, int justificationMode, int[]? leftIndents, int[]? rightIndents, androidx.ui.text.platform.LayoutIntrinsics layoutIntrinsics);
     method public boolean getDidExceedMaxLines();
     method public int getHeight();
     method public android.text.Layout getLayout();
-    method public androidx.text.LayoutIntrinsics getLayoutIntrinsics();
+    method public androidx.ui.text.platform.LayoutIntrinsics getLayoutIntrinsics();
     method public float getLineBaseline(int line);
     method public float getLineBottom(int line);
     method public int getLineCount();
@@ -55,7 +55,7 @@ package androidx.text {
 
 }
 
-package androidx.text.selection {
+package androidx.ui.text.platform.selection {
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class WordBoundary {
     ctor public WordBoundary(java.util.Locale locale, CharSequence text);
@@ -65,7 +65,7 @@ package androidx.text.selection {
 
 }
 
-package androidx.text.style {
+package androidx.ui.text.platform.style {
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class BaselineShiftSpan extends android.text.style.MetricAffectingSpan {
     ctor public BaselineShiftSpan(float multiplier);
@@ -119,7 +119,7 @@ package androidx.text.style {
     field public static final int ALIGN_TEXT_CENTER = 6; // 0x6
     field public static final int ALIGN_TEXT_TOP = 4; // 0x4
     field public static final int ALIGN_TOP = 1; // 0x1
-    field public static final androidx.text.style.PlaceholderSpan.Companion! Companion;
+    field public static final androidx.ui.text.platform.style.PlaceholderSpan.Companion! Companion;
     field public static final int UNIT_EM = 1; // 0x1
     field public static final int UNIT_INHERIT = 2; // 0x2
     field public static final int UNIT_SP = 0; // 0x0
diff --git a/ui/ui-android-text/src/androidTest/AndroidManifest.xml b/ui/ui-android-text/src/androidTest/AndroidManifest.xml
index 50fc8dc854f..50773121cd9 100644
--- a/ui/ui-android-text/src/androidTest/AndroidManifest.xml
+++ b/ui/ui-android-text/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.text.test" />
+<manifest package="androidx.ui.text.platform.test" />
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/BoringLayoutFactoryTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/BoringLayoutFactoryTest.kt
index ec37b867537..ef1b08e0947 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/BoringLayoutFactoryTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/BoringLayoutFactoryTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text
+package androidx.ui.text.platform
 
 import android.text.BoringLayout
 import android.text.BoringLayout.Metrics
@@ -26,8 +26,8 @@ import android.text.TextUtils
 import android.text.style.ForegroundColorSpan
 import android.text.style.LeadingMarginSpan
 import androidx.test.filters.SmallTest
-import androidx.text.BoringLayoutFactory.create
-import androidx.text.BoringLayoutFactory.measure
+import androidx.ui.text.platform.BoringLayoutFactory.create
+import androidx.ui.text.platform.BoringLayoutFactory.measure
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/LayoutIntrinsicsTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/LayoutIntrinsicsTest.kt
index c0a313e597c..602d44ecafb 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/LayoutIntrinsicsTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/LayoutIntrinsicsTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text
+package androidx.ui.text.platform
 
 import android.graphics.Typeface
 import android.text.BoringLayout
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/StaticLayoutFactoryTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/StaticLayoutFactoryTest.kt
index 6f79444a66f..7b829811470 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/StaticLayoutFactoryTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/StaticLayoutFactoryTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text
+package androidx.ui.text.platform
 
 import android.app.Instrumentation
 import android.graphics.Typeface
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/TextLayoutSpanTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/TextLayoutSpanTest.kt
index ce878531a81..c966edb9adb 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/TextLayoutSpanTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/TextLayoutSpanTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text
+package androidx.ui.text.platform
 
 import android.graphics.Typeface
 import android.text.SpannableString
@@ -23,8 +23,8 @@ import android.text.TextPaint
 import android.text.style.ScaleXSpan
 import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
-import androidx.text.style.BaselineShiftSpan
-import androidx.text.style.SkewXSpan
+import androidx.ui.text.platform.style.BaselineShiftSpan
+import androidx.ui.text.platform.style.SkewXSpan
 import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.any
 import org.junit.Before
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/TextLayoutTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/TextLayoutTest.kt
index 1d3e64e8c25..2a6d0a767a7 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/TextLayoutTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/TextLayoutTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text
+package androidx.ui.text.platform
 
 import android.graphics.Typeface
 import android.text.BoringLayout
@@ -25,7 +25,7 @@ import android.text.StaticLayout
 import android.text.TextPaint
 import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
-import androidx.text.style.BaselineShiftSpan
+import androidx.ui.text.platform.style.BaselineShiftSpan
 import com.google.common.truth.Truth.assertThat
 import org.junit.Before
 import org.junit.Test
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/selection/WordBoundaryTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/selection/WordBoundaryTest.kt
index d1bb48ee322..cf7d725f1e6 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/selection/WordBoundaryTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/selection/WordBoundaryTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.selection
+package androidx.ui.text.platform.selection
 
 import androidx.test.filters.SmallTest
 import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/selection/WordIteratorTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/selection/WordIteratorTest.kt
index 6adc86dbf0d..226ccb80db6 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/selection/WordIteratorTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/selection/WordIteratorTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text.selection
+package androidx.ui.text.platform.selection
 
 import androidx.test.filters.SmallTest
 import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/style/BaselineShiftSpanTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/BaselineShiftSpanTest.kt
index 62cbcb38160..da9308b362e 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/style/BaselineShiftSpanTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/BaselineShiftSpanTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import androidx.test.filters.SmallTest
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/style/FontFeatureSpanTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/FontFeatureSpanTest.kt
index 389c7f60a0e..93199817d21 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/style/FontFeatureSpanTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/FontFeatureSpanTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import androidx.test.filters.SmallTest
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/style/LetterSpacingSpanEmTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanEmTest.kt
index d475ac0d2c0..c2889ccad88 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/style/LetterSpacingSpanEmTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanEmTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import androidx.test.filters.SmallTest
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/style/LetterSpacingSpanPxTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanPxTest.kt
index db4c3e5d435..16a6ceeb9f7 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/style/LetterSpacingSpanPxTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/LetterSpacingSpanPxTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import androidx.test.filters.SmallTest
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/style/PlaceholderSpanTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/PlaceholderSpanTest.kt
index ffacabfc320..b96ecdcc737 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/style/PlaceholderSpanTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/PlaceholderSpanTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.graphics.Paint
 import android.text.TextPaint
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/style/ShadowSpanTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/ShadowSpanTest.kt
index 55222ac62a6..a9925618821 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/style/ShadowSpanTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/ShadowSpanTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import androidx.test.filters.SmallTest
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/style/SkewXSpanTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/SkewXSpanTest.kt
index a1344674bcb..4835b493b81 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/style/SkewXSpanTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/SkewXSpanTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import androidx.test.filters.SmallTest
diff --git a/ui/ui-android-text/src/androidTest/java/androidx/text/style/TypefaceSpanTest.kt b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/TypefaceSpanTest.kt
index 74adc0ea040..a67d8d98e5b 100644
--- a/ui/ui-android-text/src/androidTest/java/androidx/text/style/TypefaceSpanTest.kt
+++ b/ui/ui-android-text/src/androidTest/java/androidx/ui/text/platform/style/TypefaceSpanTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.graphics.Typeface
 import android.text.TextPaint
diff --git a/ui/ui-android-text/src/main/AndroidManifest.xml b/ui/ui-android-text/src/main/AndroidManifest.xml
index 4eeb95c2301..c7bd444419c 100644
--- a/ui/ui-android-text/src/main/AndroidManifest.xml
+++ b/ui/ui-android-text/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.text" />
+<manifest package="androidx.ui.text.platform" />
diff --git a/ui/ui-android-text/src/main/java/androidx/text/BoringLayoutFactory.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/BoringLayoutFactory.kt
index 7ea0faf3ca5..608acb3ec01 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/BoringLayoutFactory.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/BoringLayoutFactory.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text
+package androidx.ui.text.platform
 
 import android.text.BoringLayout
 import android.text.BoringLayout.Metrics
diff --git a/ui/ui-android-text/src/main/java/androidx/text/CharSequenceCharacterIterator.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/CharSequenceCharacterIterator.kt
index 2a4f6aa44d7..1307d6f1c30 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/CharSequenceCharacterIterator.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/CharSequenceCharacterIterator.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text
+package androidx.ui.text.platform
 
 import java.text.CharacterIterator
 
@@ -28,9 +28,8 @@ import java.text.CharacterIterator
  * @param charSequence The given char sequence.
  * @param start The index of the beginning of the range.
  * @param end The index of the end of the range.
- * @suppress
  */
-class CharSequenceCharacterIterator(
+internal class CharSequenceCharacterIterator(
     private val charSequence: CharSequence,
     private val start: Int,
     private val end: Int
diff --git a/ui/ui-android-text/src/main/java/androidx/text/LayoutCompat.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/LayoutCompat.kt
index 049f1d2d233..f463b0a6fe0 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/LayoutCompat.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/LayoutCompat.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text
+package androidx.ui.text.platform
 
 import android.graphics.text.LineBreaker
 import android.text.Layout
diff --git a/ui/ui-android-text/src/main/java/androidx/text/LayoutIntrinsics.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/LayoutIntrinsics.kt
index 8afa26b0f9b..4d984a4b048 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/LayoutIntrinsics.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/LayoutIntrinsics.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text
+package androidx.ui.text.platform
 
 import android.text.BoringLayout
 import android.text.Layout
@@ -46,7 +46,7 @@ class LayoutIntrinsics(
     /**
      * Calculate minimum intrinsic width of the CharSequence.
      *
-     * @see androidx.text.minIntrinsicWidth
+     * @see androidx.ui.text.platformminIntrinsicWidth
      */
     val minIntrinsicWidth: Float by lazy {
         minIntrinsicWidth(charSequence, textPaint)
diff --git a/ui/ui-android-text/src/main/java/androidx/text/StaticLayoutFactory.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/StaticLayoutFactory.kt
index 8c767e2ef77..30d41d30ef5 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/StaticLayoutFactory.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/StaticLayoutFactory.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text
+package androidx.ui.text.platform
 
 import android.os.Build
 import android.text.Layout.Alignment
@@ -25,9 +25,9 @@ import android.text.TextUtils.TruncateAt
 import android.util.Log
 import androidx.annotation.FloatRange
 import androidx.annotation.IntRange
-import androidx.text.LayoutCompat.BreakStrategy
-import androidx.text.LayoutCompat.HyphenationFrequency
-import androidx.text.LayoutCompat.JustificationMode
+import androidx.ui.text.platform.LayoutCompat.BreakStrategy
+import androidx.ui.text.platform.LayoutCompat.HyphenationFrequency
+import androidx.ui.text.platform.LayoutCompat.JustificationMode
 import java.lang.reflect.Constructor
 import java.lang.reflect.InvocationTargetException
 
diff --git a/ui/ui-android-text/src/main/java/androidx/text/TextLayout.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/TextLayout.kt
index 0baebf40c3c..f904ebcb416 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/TextLayout.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/TextLayout.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text
+package androidx.ui.text.platform
 
 import android.graphics.Canvas
 import android.graphics.Path
@@ -28,31 +28,31 @@ import androidx.annotation.Px
 import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
 import androidx.annotation.VisibleForTesting
-import androidx.text.LayoutCompat.ALIGN_CENTER
-import androidx.text.LayoutCompat.ALIGN_LEFT
-import androidx.text.LayoutCompat.ALIGN_NORMAL
-import androidx.text.LayoutCompat.ALIGN_OPPOSITE
-import androidx.text.LayoutCompat.ALIGN_RIGHT
-import androidx.text.LayoutCompat.BreakStrategy
-import androidx.text.LayoutCompat.DEFAULT_ALIGNMENT
-import androidx.text.LayoutCompat.DEFAULT_BREAK_STRATEGY
-import androidx.text.LayoutCompat.DEFAULT_HYPHENATION_FREQUENCY
-import androidx.text.LayoutCompat.DEFAULT_INCLUDE_PADDING
-import androidx.text.LayoutCompat.DEFAULT_JUSTIFICATION_MODE
-import androidx.text.LayoutCompat.DEFAULT_LINESPACING_EXTRA
-import androidx.text.LayoutCompat.DEFAULT_LINESPACING_MULTIPLIER
-import androidx.text.LayoutCompat.DEFAULT_TEXT_DIRECTION
-import androidx.text.LayoutCompat.HyphenationFrequency
-import androidx.text.LayoutCompat.JustificationMode
-import androidx.text.LayoutCompat.TEXT_DIRECTION_ANY_RTL_LTR
-import androidx.text.LayoutCompat.TEXT_DIRECTION_FIRST_STRONG_LTR
-import androidx.text.LayoutCompat.TEXT_DIRECTION_FIRST_STRONG_RTL
-import androidx.text.LayoutCompat.TEXT_DIRECTION_LOCALE
-import androidx.text.LayoutCompat.TEXT_DIRECTION_LTR
-import androidx.text.LayoutCompat.TEXT_DIRECTION_RTL
-import androidx.text.LayoutCompat.TextDirection
-import androidx.text.LayoutCompat.TextLayoutAlignment
-import androidx.text.style.BaselineShiftSpan
+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 kotlin.math.ceil
 import kotlin.math.min
 
diff --git a/ui/ui-android-text/src/main/java/androidx/text/selection/WordBoundary.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/selection/WordBoundary.kt
index fe2388688f4..364a15eee8d 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/selection/WordBoundary.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/selection/WordBoundary.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.selection
+package androidx.ui.text.platform.selection
 
 import androidx.annotation.RestrictTo
 import androidx.annotation.RestrictTo.Scope
diff --git a/ui/ui-android-text/src/main/java/androidx/text/selection/WordIterator.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/selection/WordIterator.kt
index 37a329f9e50..20d818ab44d 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/selection/WordIterator.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/selection/WordIterator.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.selection
+package androidx.ui.text.platform.selection
 
-import androidx.text.CharSequenceCharacterIterator
+import androidx.ui.text.platform.CharSequenceCharacterIterator
 import java.text.BreakIterator
 import java.util.Locale
 import kotlin.math.max
diff --git a/ui/ui-android-text/src/main/java/androidx/text/style/BaselineShiftSpan.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/BaselineShiftSpan.kt
index b48d478032a..397988a7441 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/style/BaselineShiftSpan.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/BaselineShiftSpan.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import kotlin.math.ceil
 import android.text.TextPaint
diff --git a/ui/ui-android-text/src/main/java/androidx/text/style/FontFeatureSpan.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/FontFeatureSpan.kt
index 48a235368aa..c0b2df5fa9e 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/style/FontFeatureSpan.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/FontFeatureSpan.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import android.text.style.MetricAffectingSpan
diff --git a/ui/ui-android-text/src/main/java/androidx/text/style/LetterSpacingSpanEm.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanEm.kt
index 533c772577d..82002f6b5e9 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/style/LetterSpacingSpanEm.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanEm.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import android.text.style.MetricAffectingSpan
diff --git a/ui/ui-android-text/src/main/java/androidx/text/style/LetterSpacingSpanPx.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanPx.kt
index ba4d141374d..08c1f8c83aa 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/style/LetterSpacingSpanPx.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/LetterSpacingSpanPx.kt
@@ -1,4 +1,4 @@
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import android.text.style.MetricAffectingSpan
diff --git a/ui/ui-android-text/src/main/java/androidx/text/style/LineHeightSpan.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/LineHeightSpan.kt
index 6686b89038f..f95abc12ae8 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/style/LineHeightSpan.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/LineHeightSpan.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.graphics.Paint.FontMetricsInt
 import androidx.annotation.RestrictTo
diff --git a/ui/ui-android-text/src/main/java/androidx/text/style/PlaceholderSpan.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/PlaceholderSpan.kt
index 158bfcf41ab..86f103e5865 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/style/PlaceholderSpan.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/PlaceholderSpan.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.annotation.SuppressLint
 import android.graphics.Canvas
@@ -40,6 +40,8 @@ import kotlin.math.min
  * height = fontMetrics.descent - fontMetrics.ascent.
  * @param pxPerSp The number of pixels 1 Sp equals to.
  * @param verticalAlign How the inline element is aligned with the text.
+ *
+ * @suppress
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 class PlaceholderSpan(
diff --git a/ui/ui-android-text/src/main/java/androidx/text/style/ShadowSpan.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/ShadowSpan.kt
index 6f319d58f88..4f81257babf 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/style/ShadowSpan.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/ShadowSpan.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import android.text.style.CharacterStyle
diff --git a/ui/ui-android-text/src/main/java/androidx/text/style/SkewXSpan.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/SkewXSpan.kt
index 58f634c0e5d..74fae06aaba 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/style/SkewXSpan.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/SkewXSpan.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.text.TextPaint
 import android.text.style.MetricAffectingSpan
diff --git a/ui/ui-android-text/src/main/java/androidx/text/style/TypefaceSpan.kt b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/TypefaceSpan.kt
index 3a07eaf7f48..0b6f77c4019 100644
--- a/ui/ui-android-text/src/main/java/androidx/text/style/TypefaceSpan.kt
+++ b/ui/ui-android-text/src/main/java/androidx/ui/text/platform/style/TypefaceSpan.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.text.style
+package androidx.ui.text.platform.style
 
 import android.graphics.Paint
 import android.graphics.Typeface
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 c95733329f1..96cde3d13b8 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,14 +13,13 @@ import android.text.style.StrikethroughSpan
 import android.text.style.UnderlineSpan
 import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
-import androidx.text.TextLayout
-import androidx.text.style.BaselineShiftSpan
-import androidx.text.style.FontFeatureSpan
-import androidx.text.style.LetterSpacingSpanEm
-import androidx.text.style.LetterSpacingSpanPx
-import androidx.text.style.ShadowSpan
-import androidx.text.style.SkewXSpan
-import androidx.text.style.TypefaceSpan
+import androidx.ui.text.platform.style.BaselineShiftSpan
+import androidx.ui.text.platform.style.FontFeatureSpan
+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.ui.text.platform.style.TypefaceSpan
 import androidx.ui.geometry.Offset
 import androidx.ui.graphics.Color
 import androidx.ui.graphics.Shadow
diff --git a/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/TextTestExtensions.kt b/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/TextTestExtensions.kt
index 7b5c8a156de..6609e1119eb 100644
--- a/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/TextTestExtensions.kt
+++ b/ui/ui-text/src/androidTest/java/androidx/ui/text/platform/TextTestExtensions.kt
@@ -21,7 +21,6 @@ import android.graphics.Canvas
 import android.graphics.Typeface
 import android.text.Layout
 import android.text.TextPaint
-import androidx.text.TextLayout
 import kotlin.math.ceil
 
 internal fun AndroidParagraph.bitmap(): Bitmap {
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
index 400f4d208a1..990e264c6ab 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraph.kt
@@ -19,18 +19,17 @@ import android.text.Spanned
 import android.text.TextPaint
 import android.text.TextUtils
 import androidx.annotation.VisibleForTesting
-import androidx.text.LayoutCompat.ALIGN_CENTER
-import androidx.text.LayoutCompat.ALIGN_LEFT
-import androidx.text.LayoutCompat.ALIGN_NORMAL
-import androidx.text.LayoutCompat.ALIGN_OPPOSITE
-import androidx.text.LayoutCompat.ALIGN_RIGHT
-import androidx.text.LayoutCompat.DEFAULT_ALIGNMENT
-import androidx.text.LayoutCompat.DEFAULT_JUSTIFICATION_MODE
-import androidx.text.LayoutCompat.DEFAULT_LINESPACING_MULTIPLIER
-import androidx.text.LayoutCompat.JUSTIFICATION_MODE_INTER_WORD
-import androidx.text.TextLayout
-import androidx.text.selection.WordBoundary
-import androidx.text.style.PlaceholderSpan
+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.ui.geometry.Rect
 import androidx.ui.graphics.Canvas
 import androidx.ui.graphics.Path
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraphHelper.kt b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraphHelper.kt
index 05d3e3705ef..af825fb0e57 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraphHelper.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraphHelper.kt
@@ -31,17 +31,15 @@ import android.text.style.ScaleXSpan
 import android.text.style.StrikethroughSpan
 import android.text.style.UnderlineSpan
 import androidx.annotation.RequiresApi
-import androidx.text.LayoutCompat
-import androidx.text.TextLayout
-import androidx.text.style.BaselineShiftSpan
-import androidx.text.style.FontFeatureSpan
-import androidx.text.style.LetterSpacingSpanEm
-import androidx.text.style.LetterSpacingSpanPx
-import androidx.text.style.LineHeightSpan
-import androidx.text.style.PlaceholderSpan
-import androidx.text.style.ShadowSpan
-import androidx.text.style.SkewXSpan
-import androidx.text.style.TypefaceSpan
+import androidx.ui.text.platform.style.BaselineShiftSpan
+import androidx.ui.text.platform.style.FontFeatureSpan
+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.PlaceholderSpan
+import androidx.ui.text.platform.style.ShadowSpan
+import androidx.ui.text.platform.style.SkewXSpan
+import androidx.ui.text.platform.style.TypefaceSpan
 import androidx.ui.graphics.Color
 import androidx.ui.unit.Density
 import androidx.ui.unit.TextUnit
diff --git a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt
index 4bdc872a231..cc8f2988224 100644
--- a/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt
+++ b/ui/ui-text/src/main/java/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt
@@ -18,7 +18,6 @@ package androidx.ui.text.platform
 
 import android.graphics.Paint
 import android.text.TextPaint
-import androidx.text.LayoutIntrinsics
 import androidx.ui.unit.Density
 import androidx.ui.text.AnnotatedString
 import androidx.ui.text.ParagraphIntrinsics