Refactors androidx.compose.ui:ui-unit to the androidx.compose.ui.unit package name
Bug: b/160233169
Test: ./gradlew checkApi
Relnote: N/A
Change-Id: I7996d6ccf9614dfef1ac75c2673eb0cad5f0deb4
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/AppBarTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/AppBarTest.kt
index 23e6798..dc84456 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/AppBarTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/AppBarTest.kt
@@ -35,10 +35,10 @@
import androidx.ui.test.onNodeWithText
import androidx.ui.test.getBoundsInRoot
import androidx.compose.ui.text.TextStyle
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.width
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/BottomNavigationTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/BottomNavigationTest.kt
index a2adcda..ead9562 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/BottomNavigationTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/BottomNavigationTest.kt
@@ -42,9 +42,9 @@
import androidx.ui.test.onNodeWithText
import androidx.ui.test.getBoundsInRoot
import androidx.ui.test.isInMutuallyExclusiveGroup
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.width
import com.google.common.truth.Truth
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ButtonScreenshotTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ButtonScreenshotTest.kt
index ced4dc4..1f613b1 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ButtonScreenshotTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ButtonScreenshotTest.kt
@@ -31,7 +31,7 @@
import androidx.ui.test.performPartialGesture
import androidx.ui.test.onNode
import androidx.ui.test.onNodeWithText
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import androidx.ui.test.hasClickAction
import androidx.ui.test.down
import androidx.ui.test.onRoot
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ButtonTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ButtonTest.kt
index 8d8a33f..b044532 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ButtonTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ButtonTest.kt
@@ -70,13 +70,13 @@
import androidx.ui.test.onNodeWithText
import androidx.ui.test.hasClickAction
import androidx.ui.test.runOnIdle
-import androidx.ui.unit.Dp
-import androidx.ui.unit.PxBounds
-import androidx.ui.unit.center
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.sp
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.PxBounds
+import androidx.compose.ui.unit.center
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.unit.width
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/CardTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/CardTest.kt
index be17107..6caa46e 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/CardTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/CardTest.kt
@@ -32,7 +32,7 @@
import androidx.ui.test.captureToBitmap
import androidx.ui.test.createComposeRule
import androidx.ui.test.onNodeWithTag
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/CheckboxUiTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/CheckboxUiTest.kt
index 57149a4..71b362d 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/CheckboxUiTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/CheckboxUiTest.kt
@@ -33,7 +33,7 @@
import androidx.ui.test.createComposeRule
import androidx.ui.test.performClick
import androidx.ui.test.onNodeWithTag
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DividerUiTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DividerUiTest.kt
index 02c81e8..fe3df3d 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DividerUiTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DividerUiTest.kt
@@ -19,7 +19,7 @@
import androidx.test.filters.MediumTest
import androidx.ui.test.assertHeightIsEqualTo
import androidx.ui.test.createComposeRule
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DrawerScreenshotTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DrawerScreenshotTest.kt
index 5356be2..313c599 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DrawerScreenshotTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DrawerScreenshotTest.kt
@@ -31,7 +31,7 @@
import androidx.ui.test.captureToBitmap
import androidx.ui.test.createComposeRule
import androidx.ui.test.onNodeWithTag
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DrawerTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DrawerTest.kt
index 6065364..68d84d0 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DrawerTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/DrawerTest.kt
@@ -50,9 +50,9 @@
import androidx.ui.test.swipeLeft
import androidx.ui.test.swipeRight
import androidx.ui.test.swipeUp
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.width
import com.google.common.truth.Truth.assertThat
import org.junit.Ignore
import org.junit.Rule
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ElevationOverlayTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ElevationOverlayTest.kt
index 5917c16..ff09fc6 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ElevationOverlayTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ElevationOverlayTest.kt
@@ -28,9 +28,9 @@
import androidx.ui.test.captureToBitmap
import androidx.ui.test.createComposeRule
import androidx.ui.test.onNodeWithTag
-import androidx.ui.unit.Dp
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/FloatingActionButtonTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/FloatingActionButtonTest.kt
index 314b61e..9d3ab5e 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/FloatingActionButtonTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/FloatingActionButtonTest.kt
@@ -48,11 +48,11 @@
import androidx.ui.test.onNodeWithTag
import androidx.ui.test.onNodeWithText
import androidx.ui.test.runOnIdle
-import androidx.ui.unit.PxBounds
-import androidx.ui.unit.center
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.PxBounds
+import androidx.compose.ui.unit.center
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.width
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/IconButtonTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/IconButtonTest.kt
index 679dd3f..3f18b2f 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/IconButtonTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/IconButtonTest.kt
@@ -34,7 +34,7 @@
import androidx.ui.test.onNode
import androidx.ui.test.onNodeWithTag
import androidx.ui.test.isToggleable
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/IconTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/IconTest.kt
index 5603816..e70ad22 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/IconTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/IconTest.kt
@@ -28,7 +28,7 @@
import androidx.ui.test.assertHeightIsEqualTo
import androidx.ui.test.assertWidthIsEqualTo
import androidx.ui.test.createComposeRule
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ListItemTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ListItemTest.kt
index 3906115..76b3d5c 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ListItemTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ListItemTest.kt
@@ -29,9 +29,9 @@
import androidx.compose.ui.graphics.ImageAsset
import androidx.ui.test.assertHeightIsEqualTo
import androidx.ui.test.createComposeRule
-import androidx.ui.unit.Dp
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/MaterialTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/MaterialTest.kt
index 3130aa7..cbf8e02 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/MaterialTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/MaterialTest.kt
@@ -35,10 +35,10 @@
import androidx.ui.test.runOnIdle
import androidx.compose.foundation.text.FirstBaseline
import androidx.compose.foundation.text.LastBaseline
-import androidx.ui.unit.Density
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.width
fun ComposeTestRule.setMaterialContent(
modifier: Modifier = Modifier,
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/MenuTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/MenuTest.kt
index f1a9f4b..5c2333c 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/MenuTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/MenuTest.kt
@@ -21,7 +21,7 @@
import androidx.compose.setValue
import androidx.test.filters.MediumTest
import androidx.ui.core.DensityAmbient
-import androidx.ui.core.LayoutDirection
+import androidx.compose.ui.unit.LayoutDirection
import androidx.ui.core.Modifier
import androidx.ui.core.testTag
import androidx.compose.foundation.Box
@@ -41,12 +41,12 @@
import androidx.ui.test.isPopup
import androidx.ui.test.runOnIdle
import androidx.ui.test.waitForIdle
-import androidx.ui.unit.Density
-import androidx.ui.unit.IntBounds
-import androidx.ui.unit.IntOffset
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.Position
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.IntBounds
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.Position
+import androidx.compose.ui.unit.dp
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ProgressIndicatorTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ProgressIndicatorTest.kt
index 7cdc17a..1e3df05 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ProgressIndicatorTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ProgressIndicatorTest.kt
@@ -29,7 +29,7 @@
import androidx.ui.test.createComposeRule
import androidx.ui.test.onNodeWithTag
import androidx.ui.test.runOnUiThread
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/RadioButtonTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/RadioButtonTest.kt
index f1875ad..cd4518d 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/RadioButtonTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/RadioButtonTest.kt
@@ -30,7 +30,7 @@
import androidx.ui.test.createComposeRule
import androidx.ui.test.performClick
import androidx.ui.test.onNodeWithTag
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ScaffoldTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ScaffoldTest.kt
index 8db57e5..2564f81 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ScaffoldTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ScaffoldTest.kt
@@ -52,10 +52,10 @@
import androidx.ui.test.runOnUiThread
import androidx.ui.test.swipeLeft
import androidx.ui.test.swipeRight
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.dp
-import androidx.ui.unit.toSize
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.toSize
+import androidx.compose.ui.unit.width
import com.google.common.truth.Truth.assertThat
import org.junit.Ignore
import org.junit.Rule
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SliderTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SliderTest.kt
index 4715193..4a318b4 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SliderTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SliderTest.kt
@@ -48,7 +48,7 @@
import androidx.ui.test.down
import androidx.ui.test.moveBy
import androidx.ui.test.up
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import com.google.common.truth.Truth
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SnackbarTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SnackbarTest.kt
index 373a939..ae7b3e2 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SnackbarTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SnackbarTest.kt
@@ -44,10 +44,10 @@
import androidx.ui.test.getBoundsInRoot
import androidx.compose.foundation.text.FirstBaseline
import androidx.compose.foundation.text.LastBaseline
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.sp
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.unit.width
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SurfaceTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SurfaceTest.kt
index 9597b1b..6de1309 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SurfaceTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SurfaceTest.kt
@@ -34,7 +34,7 @@
import androidx.ui.test.captureToBitmap
import androidx.ui.test.createComposeRule
import androidx.ui.test.onNodeWithTag
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SwitchTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SwitchTest.kt
index 73d375c..1f103f5 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SwitchTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/SwitchTest.kt
@@ -39,7 +39,7 @@
import androidx.ui.test.runOnIdle
import androidx.ui.test.swipeLeft
import androidx.ui.test.swipeRight
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import com.google.common.truth.Truth
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/TabTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/TabTest.kt
index 19cdfc3..e0d5013 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/TabTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/TabTest.kt
@@ -45,9 +45,9 @@
import androidx.ui.test.onNodeWithTag
import androidx.ui.test.getBoundsInRoot
import androidx.ui.test.isInMutuallyExclusiveGroup
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.width
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ripple/RippleIndicationTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ripple/RippleIndicationTest.kt
index 0fb63d1..4b3f082 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ripple/RippleIndicationTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/ripple/RippleIndicationTest.kt
@@ -55,7 +55,7 @@
import androidx.ui.test.onNodeWithTag
import androidx.ui.test.runOnUiThread
import androidx.ui.test.waitForIdle
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import com.google.common.truth.Truth
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/FilledTextFieldTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/FilledTextFieldTest.kt
index 7bd1f6a..44d4cf5 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/FilledTextFieldTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/FilledTextFieldTest.kt
@@ -64,9 +64,9 @@
import androidx.ui.test.waitForIdle
import androidx.compose.foundation.text.FirstBaseline
import androidx.compose.ui.text.SoftwareKeyboardController
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.dp
-import androidx.ui.unit.sp
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.atLeastOnce
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/OutlinedTextFieldTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/OutlinedTextFieldTest.kt
index 94cd864..202e85e 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/OutlinedTextFieldTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/OutlinedTextFieldTest.kt
@@ -58,8 +58,8 @@
import androidx.ui.test.performImeAction
import androidx.ui.test.waitForIdle
import androidx.compose.ui.text.SoftwareKeyboardController
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.atLeastOnce
diff --git a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/TextFieldTest.kt b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/TextFieldTest.kt
index bce73fd..354ecde 100644
--- a/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/TextFieldTest.kt
+++ b/ui/ui-material/src/androidAndroidTest/kotlin/androidx/ui/material/textfield/TextFieldTest.kt
@@ -41,8 +41,8 @@
import androidx.ui.test.runOnIdle
import androidx.ui.test.swipeDown
import androidx.ui.test.swipeUp
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/AlertDialog.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/AlertDialog.kt
index d18ae5e..52abcb4 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/AlertDialog.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/AlertDialog.kt
@@ -34,7 +34,7 @@
import androidx.compose.foundation.layout.preferredWidth
import androidx.ui.material.AlertDialogButtonLayout.SideBySide
import androidx.ui.material.AlertDialogButtonLayout.Stacked
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
/**
* Alert dialog is a [Dialog] which interrupts the user with urgent information, details or actions.
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/AppBar.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/AppBar.kt
index e129b95..d31927f 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/AppBar.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/AppBar.kt
@@ -40,12 +40,12 @@
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.preferredWidth
-import androidx.ui.unit.Density
-import androidx.ui.unit.Dp
-import androidx.ui.unit.PxBounds
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.PxBounds
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.width
import kotlin.math.sqrt
/**
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/BottomNavigation.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/BottomNavigation.kt
index e44a4d1..ab7d02f 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/BottomNavigation.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/BottomNavigation.kt
@@ -23,7 +23,7 @@
import androidx.compose.Providers
import androidx.compose.emptyContent
import androidx.compose.animation.animate
-import androidx.ui.core.Constraints
+import androidx.compose.ui.unit.Constraints
import androidx.ui.core.Layout
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -46,8 +46,8 @@
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.text.LastBaseline
import androidx.compose.ui.text.style.TextAlign
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
import androidx.ui.util.annotation.FloatRange
import kotlin.math.max
import kotlin.math.roundToInt
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Button.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Button.kt
index ebc365d..99c506d 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Button.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Button.kt
@@ -38,8 +38,8 @@
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.defaultMinSizeConstraints
import androidx.compose.foundation.layout.padding
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
/**
* Material Design implementation of a
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Card.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Card.kt
index 25262d8..d100ebc 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Card.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Card.kt
@@ -21,8 +21,8 @@
import androidx.compose.foundation.Border
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
/**
* Cards are [Surface]s that display content and actions on a single topic.
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Checkbox.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Checkbox.kt
index ca48f5f..aa71f1a 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Checkbox.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Checkbox.kt
@@ -46,7 +46,7 @@
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.ui.material.ripple.RippleIndication
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import androidx.ui.util.lerp
/**
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Divider.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Divider.kt
index 62da9a4..c3ba91d 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Divider.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Divider.kt
@@ -24,8 +24,8 @@
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
/**
* A divider is a thin line that groups content in lists and layouts
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Drawer.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Drawer.kt
index a29662f..3e034cd 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Drawer.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Drawer.kt
@@ -21,7 +21,7 @@
import androidx.compose.State
import androidx.compose.state
import androidx.ui.core.DensityAmbient
-import androidx.ui.core.LayoutDirection
+import androidx.compose.ui.unit.LayoutDirection
import androidx.ui.core.Modifier
import androidx.ui.core.WithConstraints
import androidx.ui.core.gesture.scrollorientationlocking.Orientation
@@ -37,8 +37,8 @@
import androidx.compose.foundation.layout.preferredSizeIn
import androidx.ui.material.internal.fixedThresholds
import androidx.ui.material.internal.stateDraggable
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
import androidx.ui.util.lerp
/**
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/FloatingActionButton.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/FloatingActionButton.kt
index c2868cb..51932bb 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/FloatingActionButton.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/FloatingActionButton.kt
@@ -37,8 +37,8 @@
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSizeIn
import androidx.compose.foundation.layout.preferredWidth
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
/**
* A floating action button (FAB) is a button that represents the primary action of a screen.
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/IconButton.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/IconButton.kt
index 246a25c..8f92cf5 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/IconButton.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/IconButton.kt
@@ -24,7 +24,7 @@
import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.layout.preferredSize
import androidx.ui.material.ripple.RippleIndication
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
/**
* IconButton is a clickable icon, used to represent actions. An IconButton has an overall minimum
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ListItem.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ListItem.kt
index 80c889a..351a465 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ListItem.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ListItem.kt
@@ -19,7 +19,7 @@
import androidx.compose.Composable
import androidx.ui.core.Alignment
import androidx.ui.core.AlignmentLine
-import androidx.ui.core.Constraints
+import androidx.compose.ui.unit.Constraints
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
import androidx.compose.foundation.Box
@@ -39,9 +39,9 @@
import androidx.compose.foundation.text.LastBaseline
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextOverflow
-import androidx.ui.unit.Dp
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
import androidx.ui.util.fastForEachIndexed
import kotlin.math.max
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Menu.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Menu.kt
index cccbf97..478e733 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Menu.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Menu.kt
@@ -29,7 +29,7 @@
import androidx.compose.animation.transition
import androidx.ui.core.DensityAmbient
import androidx.ui.core.DrawLayerModifier
-import androidx.ui.core.LayoutDirection
+import androidx.compose.ui.unit.LayoutDirection
import androidx.ui.core.Modifier
import androidx.ui.core.Popup
import androidx.ui.core.PopupPositionProvider
@@ -47,14 +47,14 @@
import androidx.compose.foundation.layout.preferredSizeIn
import androidx.compose.foundation.layout.preferredWidth
import androidx.ui.material.ripple.RippleIndication
-import androidx.ui.unit.Density
-import androidx.ui.unit.IntBounds
-import androidx.ui.unit.IntOffset
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.Position
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.width
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.IntBounds
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.Position
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.width
import kotlin.math.max
import kotlin.math.min
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/OutlinedTextField.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/OutlinedTextField.kt
index de27cae..e907524 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/OutlinedTextField.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/OutlinedTextField.kt
@@ -27,9 +27,9 @@
import androidx.compose.setValue
import androidx.compose.state
import androidx.ui.core.Alignment
-import androidx.ui.core.Constraints
+import androidx.compose.ui.unit.Constraints
import androidx.ui.core.Layout
-import androidx.ui.core.LayoutDirection
+import androidx.compose.ui.unit.LayoutDirection
import androidx.ui.core.Modifier
import androidx.ui.core.Placeable
import androidx.ui.core.drawBehind
@@ -38,7 +38,7 @@
import androidx.ui.core.focus.focusState
import androidx.ui.core.id
import androidx.ui.core.layoutId
-import androidx.ui.core.offset
+import androidx.compose.ui.unit.offset
import androidx.compose.foundation.Box
import androidx.compose.foundation.Text
import androidx.compose.foundation.currentTextStyle
@@ -55,8 +55,8 @@
import androidx.compose.ui.text.SoftwareKeyboardController
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.constrain
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
import kotlin.math.max
import kotlin.math.roundToInt
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ProgressIndicator.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ProgressIndicator.kt
index 9261fb0..106e03c 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ProgressIndicator.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ProgressIndicator.kt
@@ -28,7 +28,7 @@
import androidx.compose.Composable
import androidx.compose.animation.transition
import androidx.ui.core.DensityAmbient
-import androidx.ui.core.LayoutDirection
+import androidx.compose.ui.unit.LayoutDirection
import androidx.ui.core.Modifier
import androidx.ui.core.semantics.semantics
import androidx.compose.foundation.Canvas
@@ -44,8 +44,8 @@
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.ui.semantics.accessibilityValue
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
import androidx.ui.util.annotation.FloatRange
import kotlin.math.abs
import kotlin.math.max
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/RadioButton.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/RadioButton.kt
index 818be78a..736f1a55 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/RadioButton.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/RadioButton.kt
@@ -42,8 +42,8 @@
import androidx.compose.foundation.layout.wrapContentSize
import androidx.ui.material.ripple.RippleIndication
import androidx.compose.ui.text.TextStyle
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
/**
* Components for creating mutually exclusive set of [RadioButton]s.
@@ -123,7 +123,7 @@
"androidx.compose.foundation.layout.Column",
"androidx.compose.foundation.layout.fillMaxWidth",
"androidx.ui.core.Modifier",
- "androidx.ui.unit.dp",
+ "androidx.compose.ui.unit.dp",
"androidx.compose.foundation.selection.selectable"
)
)
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Scaffold.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Scaffold.kt
index 9f9dcba..ea0fbf4 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Scaffold.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Scaffold.kt
@@ -42,12 +42,12 @@
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.ui.material.Scaffold.FabPosition
-import androidx.ui.unit.Dp
-import androidx.ui.unit.PxBounds
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.PxBounds
import androidx.compose.ui.geometry.Size
-import androidx.ui.unit.dp
-import androidx.ui.unit.height
-import androidx.ui.unit.toSize
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.height
+import androidx.compose.ui.unit.toSize
/**
* State for [Scaffold] composable component.
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Shapes.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Shapes.kt
index 2c2de1f..07447c6 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Shapes.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Shapes.kt
@@ -19,7 +19,7 @@
import androidx.compose.staticAmbientOf
import androidx.compose.foundation.shape.corner.CornerBasedShape
import androidx.compose.foundation.shape.corner.RoundedCornerShape
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
/**
* Components are grouped into shape categories based on their size. These categories provide a
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Slider.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Slider.kt
index 0838c2f..696f0bc 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Slider.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Slider.kt
@@ -27,7 +27,7 @@
import androidx.ui.core.Alignment
import androidx.ui.core.AnimationClockAmbient
import androidx.ui.core.DensityAmbient
-import androidx.ui.core.LayoutDirection
+import androidx.compose.ui.unit.LayoutDirection
import androidx.ui.core.Modifier
import androidx.ui.core.WithConstraints
import androidx.ui.core.gesture.pressIndicatorGestureFilter
@@ -63,7 +63,7 @@
import androidx.ui.semantics.scrollBackward
import androidx.ui.semantics.scrollForward
import androidx.ui.semantics.setProgress
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
import androidx.ui.util.format
import androidx.ui.util.lerp
import androidx.ui.util.annotation.IntRange
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Snackbar.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Snackbar.kt
index 68a8e0e..6802415 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Snackbar.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Snackbar.kt
@@ -34,8 +34,8 @@
import androidx.compose.foundation.layout.relativePaddingFrom
import androidx.compose.foundation.text.FirstBaseline
import androidx.compose.foundation.text.LastBaseline
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
import kotlin.math.max
/**
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Surface.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Surface.kt
index ddc7597..4b7bfe0 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Surface.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Surface.kt
@@ -35,8 +35,8 @@
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.compositeOver
import androidx.compose.ui.text.TextStyle
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
import kotlin.math.ln
/**
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Switch.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Switch.kt
index e45d045..0ae74e4 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Switch.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Switch.kt
@@ -23,7 +23,7 @@
import androidx.compose.state
import androidx.ui.core.Alignment
import androidx.ui.core.DensityAmbient
-import androidx.ui.core.LayoutDirection
+import androidx.compose.ui.unit.LayoutDirection
import androidx.ui.core.Modifier
import androidx.ui.core.WithConstraints
import androidx.ui.core.gesture.scrollorientationlocking.Orientation
@@ -51,7 +51,7 @@
import androidx.ui.material.SwitchDefaults.uncheckedTrackColor
import androidx.ui.material.internal.stateDraggable
import androidx.ui.material.ripple.RippleIndication
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.dp
/**
* A Switch is a two state toggleable component that provides on/off like options
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Tab.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Tab.kt
index aaccde8..2241f01 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Tab.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Tab.kt
@@ -32,7 +32,7 @@
import androidx.compose.animation.DpPropKey
import androidx.compose.animation.transition
import androidx.ui.core.Alignment
-import androidx.ui.core.Constraints
+import androidx.compose.ui.unit.Constraints
import androidx.ui.core.DensityAmbient
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
@@ -63,10 +63,10 @@
import androidx.compose.foundation.text.FirstBaseline
import androidx.compose.foundation.text.LastBaseline
import androidx.compose.ui.text.style.TextAlign
-import androidx.ui.unit.Density
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
-import androidx.ui.unit.sp
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
import androidx.ui.util.fastFirstOrNull
import androidx.ui.util.fastForEach
import androidx.ui.util.fastForEachIndexed
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/TextField.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/TextField.kt
index 9660a68..866c46b 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/TextField.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/TextField.kt
@@ -28,7 +28,7 @@
import androidx.ui.core.drawBehind
import androidx.ui.core.id
import androidx.ui.core.layoutId
-import androidx.ui.core.offset
+import androidx.compose.ui.unit.offset
import androidx.compose.foundation.Box
import androidx.compose.foundation.Text
import androidx.compose.foundation.background
@@ -47,9 +47,9 @@
import androidx.compose.ui.text.SoftwareKeyboardController
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.constrain
-import androidx.ui.unit.Dp
-import androidx.ui.unit.IntSize
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
import kotlin.math.max
import kotlin.math.roundToInt
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/TextFieldImpl.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/TextFieldImpl.kt
index aaef65a..a434e42 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/TextFieldImpl.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/TextFieldImpl.kt
@@ -35,9 +35,9 @@
import androidx.compose.animation.ColorPropKey
import androidx.compose.animation.DpPropKey
import androidx.compose.animation.transition
-import androidx.ui.core.Constraints
+import androidx.compose.ui.unit.Constraints
import androidx.ui.core.Layout
-import androidx.ui.core.LayoutDirection
+import androidx.compose.ui.unit.LayoutDirection
import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
@@ -45,12 +45,12 @@
import androidx.ui.core.Placeable
import androidx.ui.core.Ref
import androidx.ui.core.clipToBounds
-import androidx.ui.core.constrainWidth
+import androidx.compose.ui.unit.constrainWidth
import androidx.ui.core.focus.FocusModifier
import androidx.ui.core.focus.FocusState
import androidx.ui.core.focus.focusState
import androidx.ui.core.gesture.scrollorientationlocking.Orientation
-import androidx.ui.core.offset
+import androidx.compose.ui.unit.offset
import androidx.compose.foundation.ContentColorAmbient
import androidx.compose.foundation.ProvideTextStyle
import androidx.compose.foundation.BaseTextField
@@ -72,8 +72,8 @@
import androidx.compose.ui.text.SoftwareKeyboardController
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.lerp
-import androidx.ui.unit.Dp
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
import androidx.ui.util.annotation.VisibleForTesting
import kotlin.math.min
import kotlin.math.roundToInt
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Typography.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Typography.kt
index 35bcec7..23cd196 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Typography.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/Typography.kt
@@ -21,7 +21,7 @@
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
-import androidx.ui.unit.sp
+import androidx.compose.ui.unit.sp
/**
* Class holding typography definitions as defined by the [Material typography specification](https://material.io/design/typography/the-type-system.html#type-scale).
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ripple/RippleAnimation.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ripple/RippleAnimation.kt
index f951613..90bf63a 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ripple/RippleAnimation.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ripple/RippleAnimation.kt
@@ -34,10 +34,10 @@
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.drawscope.DrawScope
import androidx.compose.ui.graphics.drawscope.clipRect
-import androidx.ui.unit.Density
-import androidx.ui.unit.dp
-import androidx.ui.unit.inMilliseconds
-import androidx.ui.unit.milliseconds
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.inMilliseconds
+import androidx.compose.ui.unit.milliseconds
import kotlin.math.max
/**
diff --git a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ripple/RippleIndication.kt b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ripple/RippleIndication.kt
index 6494336..b776fd8 100644
--- a/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ripple/RippleIndication.kt
+++ b/ui/ui-material/src/commonMain/kotlin/androidx/ui/material/ripple/RippleIndication.kt
@@ -43,7 +43,7 @@
import androidx.compose.ui.graphics.useOrElse
import androidx.ui.material.ExperimentalMaterialApi
import androidx.ui.material.MaterialTheme
-import androidx.ui.unit.Dp
+import androidx.compose.ui.unit.Dp
import androidx.ui.util.fastForEach
import androidx.ui.util.nativeClass
diff --git a/ui/ui-material/src/test/kotlin/androidx/ui/material/ripple/RippleAnimationTest.kt b/ui/ui-material/src/test/kotlin/androidx/ui/material/ripple/RippleAnimationTest.kt
index e548f06..e63d65fd 100644
--- a/ui/ui-material/src/test/kotlin/androidx/ui/material/ripple/RippleAnimationTest.kt
+++ b/ui/ui-material/src/test/kotlin/androidx/ui/material/ripple/RippleAnimationTest.kt
@@ -16,8 +16,8 @@
package androidx.ui.material.ripple
import androidx.compose.ui.geometry.Size
-import androidx.ui.unit.Density
-import androidx.ui.unit.dp
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith