[go: nahoru, domu]

Refactors androidx.compose.foundation:foundation-layout to the androidx.compose.foundation.layout package name

Bug: b/160233169
Test: ./gradlew checkApi
Relnote: N/A
Change-Id: Id0bb67fe007f9e7fed5a2fa1d504ba6d77886eeb
diff --git a/ui/ui-layout/api/restricted_current.txt b/ui/ui-layout/api/restricted_current.txt
index 88edca5..51192c3 100644
--- a/ui/ui-layout/api/restricted_current.txt
+++ b/ui/ui-layout/api/restricted_current.txt
@@ -1,38 +1,38 @@
 // Signature format: 3.0
-package androidx.ui.layout {
+package androidx.compose.foundation.layout {
 
   @androidx.compose.Immutable public final class AbsoluteArrangement {
-    field public static final androidx.ui.layout.AbsoluteArrangement INSTANCE;
+    field public static final androidx.compose.foundation.layout.AbsoluteArrangement INSTANCE;
   }
 
-  public static final class AbsoluteArrangement.Center implements androidx.ui.layout.Arrangement.Horizontal {
+  public static final class AbsoluteArrangement.Center implements androidx.compose.foundation.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.AbsoluteArrangement.Center INSTANCE;
+    field public static final androidx.compose.foundation.layout.AbsoluteArrangement.Center INSTANCE;
   }
 
-  public static final class AbsoluteArrangement.Left implements androidx.ui.layout.Arrangement.Horizontal {
+  public static final class AbsoluteArrangement.Left implements androidx.compose.foundation.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.AbsoluteArrangement.Left INSTANCE;
+    field public static final androidx.compose.foundation.layout.AbsoluteArrangement.Left INSTANCE;
   }
 
-  public static final class AbsoluteArrangement.Right implements androidx.ui.layout.Arrangement.Horizontal {
+  public static final class AbsoluteArrangement.Right implements androidx.compose.foundation.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.AbsoluteArrangement.Right INSTANCE;
+    field public static final androidx.compose.foundation.layout.AbsoluteArrangement.Right INSTANCE;
   }
 
-  public static final class AbsoluteArrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal {
+  public static final class AbsoluteArrangement.SpaceAround implements androidx.compose.foundation.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.AbsoluteArrangement.SpaceAround INSTANCE;
+    field public static final androidx.compose.foundation.layout.AbsoluteArrangement.SpaceAround INSTANCE;
   }
 
-  public static final class AbsoluteArrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal {
+  public static final class AbsoluteArrangement.SpaceBetween implements androidx.compose.foundation.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.AbsoluteArrangement.SpaceBetween INSTANCE;
+    field public static final androidx.compose.foundation.layout.AbsoluteArrangement.SpaceBetween INSTANCE;
   }
 
-  public static final class AbsoluteArrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal {
+  public static final class AbsoluteArrangement.SpaceEvenly implements androidx.compose.foundation.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.AbsoluteArrangement.SpaceEvenly INSTANCE;
+    field public static final androidx.compose.foundation.layout.AbsoluteArrangement.SpaceEvenly INSTANCE;
   }
 
   public final class AlignmentLineKt {
@@ -41,55 +41,55 @@
   }
 
   @androidx.compose.Immutable public final class Arrangement {
-    field public static final androidx.ui.layout.Arrangement INSTANCE;
+    field public static final androidx.compose.foundation.layout.Arrangement INSTANCE;
   }
 
-  public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
+  public static final class Arrangement.Bottom implements androidx.compose.foundation.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size);
-    field public static final androidx.ui.layout.Arrangement.Bottom INSTANCE;
+    field public static final androidx.compose.foundation.layout.Arrangement.Bottom INSTANCE;
   }
 
-  public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+  public static final class Arrangement.Center implements androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size);
-    field public static final androidx.ui.layout.Arrangement.Center INSTANCE;
+    field public static final androidx.compose.foundation.layout.Arrangement.Center INSTANCE;
   }
 
-  public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
+  public static final class Arrangement.End implements androidx.compose.foundation.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.End INSTANCE;
+    field public static final androidx.compose.foundation.layout.Arrangement.End INSTANCE;
   }
 
   public static interface Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
   }
 
-  public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+  public static final class Arrangement.SpaceAround implements androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size);
-    field public static final androidx.ui.layout.Arrangement.SpaceAround INSTANCE;
+    field public static final androidx.compose.foundation.layout.Arrangement.SpaceAround INSTANCE;
   }
 
-  public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+  public static final class Arrangement.SpaceBetween implements androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size);
-    field public static final androidx.ui.layout.Arrangement.SpaceBetween INSTANCE;
+    field public static final androidx.compose.foundation.layout.Arrangement.SpaceBetween INSTANCE;
   }
 
-  public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
+  public static final class Arrangement.SpaceEvenly implements androidx.compose.foundation.layout.Arrangement.Horizontal androidx.compose.foundation.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size);
-    field public static final androidx.ui.layout.Arrangement.SpaceEvenly INSTANCE;
+    field public static final androidx.compose.foundation.layout.Arrangement.SpaceEvenly INSTANCE;
   }
 
-  public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
+  public static final class Arrangement.Start implements androidx.compose.foundation.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Start INSTANCE;
+    field public static final androidx.compose.foundation.layout.Arrangement.Start INSTANCE;
   }
 
-  public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
+  public static final class Arrangement.Top implements androidx.compose.foundation.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size);
-    field public static final androidx.ui.layout.Arrangement.Top INSTANCE;
+    field public static final androidx.compose.foundation.layout.Arrangement.Top INSTANCE;
   }
 
   public static interface Arrangement.Vertical {
@@ -97,237 +97,237 @@
   }
 
   public final class ChainStyle {
-    field public static final androidx.ui.layout.ChainStyle.Companion Companion;
+    field public static final androidx.compose.foundation.layout.ChainStyle.Companion Companion;
   }
 
   public static final class ChainStyle.Companion {
-    method public androidx.ui.layout.ChainStyle Packed(float bias);
-    method public androidx.ui.layout.ChainStyle getPacked();
-    method public androidx.ui.layout.ChainStyle getSpread();
-    method public androidx.ui.layout.ChainStyle getSpreadInside();
-    property public final androidx.ui.layout.ChainStyle Packed;
-    property public final androidx.ui.layout.ChainStyle Spread;
-    property public final androidx.ui.layout.ChainStyle SpreadInside;
+    method public androidx.compose.foundation.layout.ChainStyle Packed(float bias);
+    method public androidx.compose.foundation.layout.ChainStyle getPacked();
+    method public androidx.compose.foundation.layout.ChainStyle getSpread();
+    method public androidx.compose.foundation.layout.ChainStyle getSpreadInside();
+    property public final androidx.compose.foundation.layout.ChainStyle Packed;
+    property public final androidx.compose.foundation.layout.ChainStyle Spread;
+    property public final androidx.compose.foundation.layout.ChainStyle SpreadInside;
   }
 
   public final class ColumnKt {
-    method @androidx.compose.Composable public static void Column(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.Arrangement.Vertical verticalArrangement = Arrangement.Top, androidx.ui.core.Alignment.Horizontal horizontalGravity = Alignment.Start, kotlin.jvm.functions.Function1<? super androidx.ui.layout.ColumnScope,kotlin.Unit> children);
+    method @androidx.compose.Composable public static void Column(androidx.ui.core.Modifier modifier = Modifier, androidx.compose.foundation.layout.Arrangement.Vertical verticalArrangement = Arrangement.Top, androidx.ui.core.Alignment.Horizontal horizontalGravity = Alignment.Start, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ColumnScope,kotlin.Unit> children);
   }
 
-  @androidx.compose.Immutable @androidx.ui.layout.LayoutScopeMarker public final class ColumnScope {
+  @androidx.compose.Immutable @androidx.compose.foundation.layout.LayoutScopeMarker public final class ColumnScope {
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.VerticalAlignmentLine alignmentLine);
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.ColumnScope INSTANCE;
+    field public static final androidx.compose.foundation.layout.ColumnScope INSTANCE;
   }
 
-  @androidx.ui.layout.LayoutScopeMarker public final class ConstrainScope {
-    method public void centerAround(androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor anchor);
-    method public void centerAround(androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor anchor);
-    method public void centerHorizontallyTo(androidx.ui.layout.ConstrainedLayoutReference other);
-    method public void centerTo(androidx.ui.layout.ConstrainedLayoutReference other);
-    method public void centerVerticallyTo(androidx.ui.layout.ConstrainedLayoutReference other);
-    method public androidx.ui.layout.ConstrainScope.VerticalAnchorable getAbsoluteLeft();
-    method public androidx.ui.layout.ConstrainScope.VerticalAnchorable getAbsoluteRight();
-    method public androidx.ui.layout.ConstrainScope.BaselineAnchorable getBaseline();
-    method public androidx.ui.layout.ConstrainScope.HorizontalAnchorable getBottom();
-    method public androidx.ui.layout.ConstrainScope.VerticalAnchorable getEnd();
-    method public androidx.ui.layout.Dimension getHeight();
-    method public androidx.ui.layout.ConstrainedLayoutReference getParent();
-    method public androidx.ui.layout.ConstrainScope.VerticalAnchorable getStart();
-    method public androidx.ui.layout.ConstrainScope.HorizontalAnchorable getTop();
-    method public androidx.ui.layout.Dimension getWidth();
-    method public void linkTo-MrnifDM(androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor start, androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor end, float startMargin = 0.dp, float endMargin = 0.dp, @FloatRange(from=0.0, to=1.0) float bias = 0.5f);
-    method public void linkTo-h2XOreo(androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor top, androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor bottom, float topMargin = 0.dp, float bottomMargin = 0.dp, @FloatRange(from=0.0, to=1.0) float bias = 0.5f);
-    method public void linkTo-tsa2a54(androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor start, androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor top, androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor end, androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor bottom, float startMargin = 0.dp, float topMargin = 0.dp, float endMargin = 0.dp, float bottomMargin = 0.dp, @FloatRange(from=0.0, to=1.0) float horizontalBias = 0.5f, @FloatRange(from=0.0, to=1.0) float verticalBias = 0.5f);
-    method public void setHeight(androidx.ui.layout.Dimension value);
-    method public void setWidth(androidx.ui.layout.Dimension value);
-    property public final androidx.ui.layout.ConstrainScope.VerticalAnchorable absoluteLeft;
-    property public final androidx.ui.layout.ConstrainScope.VerticalAnchorable absoluteRight;
-    property public final androidx.ui.layout.ConstrainScope.BaselineAnchorable baseline;
-    property public final androidx.ui.layout.ConstrainScope.HorizontalAnchorable bottom;
-    property public final androidx.ui.layout.ConstrainScope.VerticalAnchorable end;
-    property public final androidx.ui.layout.Dimension height;
-    property public final androidx.ui.layout.ConstrainedLayoutReference parent;
-    property public final androidx.ui.layout.ConstrainScope.VerticalAnchorable start;
-    property public final androidx.ui.layout.ConstrainScope.HorizontalAnchorable top;
-    property public final androidx.ui.layout.Dimension width;
+  @androidx.compose.foundation.layout.LayoutScopeMarker public final class ConstrainScope {
+    method public void centerAround(androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor anchor);
+    method public void centerAround(androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor anchor);
+    method public void centerHorizontallyTo(androidx.compose.foundation.layout.ConstrainedLayoutReference other);
+    method public void centerTo(androidx.compose.foundation.layout.ConstrainedLayoutReference other);
+    method public void centerVerticallyTo(androidx.compose.foundation.layout.ConstrainedLayoutReference other);
+    method public androidx.compose.foundation.layout.ConstrainScope.VerticalAnchorable getAbsoluteLeft();
+    method public androidx.compose.foundation.layout.ConstrainScope.VerticalAnchorable getAbsoluteRight();
+    method public androidx.compose.foundation.layout.ConstrainScope.BaselineAnchorable getBaseline();
+    method public androidx.compose.foundation.layout.ConstrainScope.HorizontalAnchorable getBottom();
+    method public androidx.compose.foundation.layout.ConstrainScope.VerticalAnchorable getEnd();
+    method public androidx.compose.foundation.layout.Dimension getHeight();
+    method public androidx.compose.foundation.layout.ConstrainedLayoutReference getParent();
+    method public androidx.compose.foundation.layout.ConstrainScope.VerticalAnchorable getStart();
+    method public androidx.compose.foundation.layout.ConstrainScope.HorizontalAnchorable getTop();
+    method public androidx.compose.foundation.layout.Dimension getWidth();
+    method public void linkTo-G1ipIQs(androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor top, androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor bottom, float topMargin = 0.dp, float bottomMargin = 0.dp, @FloatRange(from=0.0, to=1.0) float bias = 0.5f);
+    method public void linkTo-TkcoPiE(androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor start, androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor end, float startMargin = 0.dp, float endMargin = 0.dp, @FloatRange(from=0.0, to=1.0) float bias = 0.5f);
+    method public void linkTo-xxHMemQ(androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor start, androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor top, androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor end, androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor bottom, float startMargin = 0.dp, float topMargin = 0.dp, float endMargin = 0.dp, float bottomMargin = 0.dp, @FloatRange(from=0.0, to=1.0) float horizontalBias = 0.5f, @FloatRange(from=0.0, to=1.0) float verticalBias = 0.5f);
+    method public void setHeight(androidx.compose.foundation.layout.Dimension value);
+    method public void setWidth(androidx.compose.foundation.layout.Dimension value);
+    property public final androidx.compose.foundation.layout.ConstrainScope.VerticalAnchorable absoluteLeft;
+    property public final androidx.compose.foundation.layout.ConstrainScope.VerticalAnchorable absoluteRight;
+    property public final androidx.compose.foundation.layout.ConstrainScope.BaselineAnchorable baseline;
+    property public final androidx.compose.foundation.layout.ConstrainScope.HorizontalAnchorable bottom;
+    property public final androidx.compose.foundation.layout.ConstrainScope.VerticalAnchorable end;
+    property public final androidx.compose.foundation.layout.Dimension height;
+    property public final androidx.compose.foundation.layout.ConstrainedLayoutReference parent;
+    property public final androidx.compose.foundation.layout.ConstrainScope.VerticalAnchorable start;
+    property public final androidx.compose.foundation.layout.ConstrainScope.HorizontalAnchorable top;
+    property public final androidx.compose.foundation.layout.Dimension width;
   }
 
   public final class ConstrainScope.BaselineAnchorable {
-    method public void linkTo-oRbSkj8(androidx.ui.layout.ConstraintLayoutBaseScope.BaselineAnchor anchor, float margin = 0.dp);
+    method public void linkTo-oVJf39w(androidx.compose.foundation.layout.ConstraintLayoutBaseScope.BaselineAnchor anchor, float margin = 0.dp);
   }
 
   public final class ConstrainScope.HorizontalAnchorable {
-    method public void linkTo-TJhmEpo(androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor anchor, float margin = 0.dp);
+    method public void linkTo-9lY5dKQ(androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor anchor, float margin = 0.dp);
   }
 
   public final class ConstrainScope.VerticalAnchorable {
-    method public void linkTo-sp3QI2o(androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor anchor, float margin = 0.dp);
+    method public void linkTo-EGV1AEI(androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor anchor, float margin = 0.dp);
   }
 
   public final class ConstrainedLayoutReference {
     ctor public ConstrainedLayoutReference(Object id);
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor getAbsoluteLeft();
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor getAbsoluteRight();
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.BaselineAnchor getBaseline();
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor getBottom();
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor getEnd();
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor getAbsoluteLeft();
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor getAbsoluteRight();
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.BaselineAnchor getBaseline();
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor getBottom();
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor getEnd();
     method public Object getId();
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor getStart();
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor getTop();
-    property public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor absoluteLeft;
-    property public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor absoluteRight;
-    property public final androidx.ui.layout.ConstraintLayoutBaseScope.BaselineAnchor baseline;
-    property public final androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor bottom;
-    property public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor end;
-    property public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor start;
-    property public final androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor top;
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor getStart();
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor getTop();
+    property public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor absoluteLeft;
+    property public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor absoluteRight;
+    property public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.BaselineAnchor baseline;
+    property public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor bottom;
+    property public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor end;
+    property public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor start;
+    property public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor top;
   }
 
   public abstract class ConstraintLayoutBaseScope {
     ctor public ConstraintLayoutBaseScope();
-    method public final void applyTo(androidx.ui.layout.State state);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createAbsoluteLeftBarrier-AuEMxJ0(androidx.ui.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createAbsoluteRightBarrier-AuEMxJ0(androidx.ui.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor createBottomBarrier-AuEMxJ0(androidx.ui.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createEndBarrier-AuEMxJ0(androidx.ui.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromAbsoluteLeft(float fraction);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromAbsoluteLeft-ipo6vVg(float offset);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromAbsoluteRight(float fraction);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromAbsoluteRight-ipo6vVg(float offset);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor createGuidelineFromBottom(float fraction);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor createGuidelineFromBottom-ipo6vVg(float offset);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromEnd(float fraction);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromEnd-ipo6vVg(float offset);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromStart(float fraction);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromStart-ipo6vVg(float offset);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor createGuidelineFromTop(float fraction);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor createGuidelineFromTop-ipo6vVg(float offset);
-    method public final void createHorizontalChain(androidx.ui.layout.ConstrainedLayoutReference![] elements, androidx.ui.layout.ChainStyle chainStyle = ChainStyle.Spread);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor createStartBarrier-AuEMxJ0(androidx.ui.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
-    method public final androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor createTopBarrier-AuEMxJ0(androidx.ui.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
-    method public final void createVerticalChain(androidx.ui.layout.ConstrainedLayoutReference![] elements, androidx.ui.layout.ChainStyle chainStyle = ChainStyle.Spread);
-    method protected final java.util.List<kotlin.jvm.functions.Function1<androidx.ui.layout.State,kotlin.Unit>> getTasks();
+    method public final void applyTo(androidx.compose.foundation.layout.State state);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createAbsoluteLeftBarrier-AuEMxJ0(androidx.compose.foundation.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createAbsoluteRightBarrier-AuEMxJ0(androidx.compose.foundation.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor createBottomBarrier-AuEMxJ0(androidx.compose.foundation.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createEndBarrier-AuEMxJ0(androidx.compose.foundation.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromAbsoluteLeft(float fraction);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromAbsoluteLeft-ipo6vVg(float offset);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromAbsoluteRight(float fraction);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromAbsoluteRight-ipo6vVg(float offset);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor createGuidelineFromBottom(float fraction);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor createGuidelineFromBottom-ipo6vVg(float offset);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromEnd(float fraction);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromEnd-ipo6vVg(float offset);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromStart(float fraction);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createGuidelineFromStart-ipo6vVg(float offset);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor createGuidelineFromTop(float fraction);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor createGuidelineFromTop-ipo6vVg(float offset);
+    method public final void createHorizontalChain(androidx.compose.foundation.layout.ConstrainedLayoutReference![] elements, androidx.compose.foundation.layout.ChainStyle chainStyle = ChainStyle.Spread);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor createStartBarrier-AuEMxJ0(androidx.compose.foundation.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
+    method public final androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor createTopBarrier-AuEMxJ0(androidx.compose.foundation.layout.ConstrainedLayoutReference![] elements, float margin = 0.dp);
+    method public final void createVerticalChain(androidx.compose.foundation.layout.ConstrainedLayoutReference![] elements, androidx.compose.foundation.layout.ChainStyle chainStyle = ChainStyle.Spread);
+    method protected final java.util.List<kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.State,kotlin.Unit>> getTasks();
     method public final void reset();
-    property protected final java.util.List<kotlin.jvm.functions.Function1<androidx.ui.layout.State,kotlin.Unit>> tasks;
+    property protected final java.util.List<kotlin.jvm.functions.Function1<androidx.compose.foundation.layout.State,kotlin.Unit>> tasks;
   }
 
   public static final class ConstraintLayoutBaseScope.BaselineAnchor {
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.BaselineAnchor copy(Object id);
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.BaselineAnchor copy(Object id);
   }
 
   public static final class ConstraintLayoutBaseScope.HorizontalAnchor {
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.HorizontalAnchor copy(Object id, int index);
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.HorizontalAnchor copy(Object id, int index);
   }
 
   public static final class ConstraintLayoutBaseScope.VerticalAnchor {
-    method public androidx.ui.layout.ConstraintLayoutBaseScope.VerticalAnchor copy(Object id, int index);
+    method public androidx.compose.foundation.layout.ConstraintLayoutBaseScope.VerticalAnchor copy(Object id, int index);
   }
 
   public final class ConstraintLayoutKt {
-    method @androidx.compose.Composable public static void ConstraintLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstraintLayoutScope,kotlin.Unit> children);
-    method @androidx.compose.Composable public static void ConstraintLayout(androidx.ui.layout.ConstraintSet constraintSet, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method @Deprecated public static androidx.ui.layout.ConstraintSet ConstraintSet(kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstraintSetBuilderScope,kotlin.Unit> description);
-    method public static androidx.ui.layout.ConstraintSet ConstraintSet2(kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstraintSetScope,kotlin.Unit> description);
-    method public static androidx.ui.layout.Dimension.MaxCoercible atLeast-UKaBGfc(androidx.ui.layout.Dimension.Coercible, float dp);
-    method public static androidx.ui.layout.Dimension atLeastWrapContent-pX8Pf4s(androidx.ui.layout.Dimension.MinCoercible, float dp);
-    method public static androidx.ui.layout.Dimension.MinCoercible atMost-UKaBGfc(androidx.ui.layout.Dimension.Coercible, float dp);
-    method public static androidx.ui.layout.Dimension atMost-bf1TpX8(androidx.ui.layout.Dimension.MaxCoercible, float dp);
-    method public static androidx.ui.layout.Dimension.MaxCoercible getAtLeastWrapContent(androidx.ui.layout.Dimension.Coercible);
-    method public static androidx.ui.layout.Dimension getAtLeastWrapContent(androidx.ui.layout.Dimension.MinCoercible);
-    method public static androidx.ui.layout.Dimension.MinCoercible getAtMostWrapContent(androidx.ui.layout.Dimension.Coercible);
-    method public static androidx.ui.layout.Dimension getAtMostWrapContent(androidx.ui.layout.Dimension.MaxCoercible);
+    method @androidx.compose.Composable public static void ConstraintLayout(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ConstraintLayoutScope,kotlin.Unit> children);
+    method @androidx.compose.Composable public static void ConstraintLayout(androidx.compose.foundation.layout.ConstraintSet constraintSet, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @Deprecated public static androidx.compose.foundation.layout.ConstraintSet ConstraintSet(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ConstraintSetBuilderScope,kotlin.Unit> description);
+    method public static androidx.compose.foundation.layout.ConstraintSet ConstraintSet2(kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ConstraintSetScope,kotlin.Unit> description);
+    method public static androidx.compose.foundation.layout.Dimension.MaxCoercible atLeast-FX2K-0s(androidx.compose.foundation.layout.Dimension.Coercible, float dp);
+    method public static androidx.compose.foundation.layout.Dimension atLeastWrapContent-vg8ks8g(androidx.compose.foundation.layout.Dimension.MinCoercible, float dp);
+    method public static androidx.compose.foundation.layout.Dimension.MinCoercible atMost-FX2K-0s(androidx.compose.foundation.layout.Dimension.Coercible, float dp);
+    method public static androidx.compose.foundation.layout.Dimension atMost-GXOViVg(androidx.compose.foundation.layout.Dimension.MaxCoercible, float dp);
+    method public static androidx.compose.foundation.layout.Dimension.MaxCoercible getAtLeastWrapContent(androidx.compose.foundation.layout.Dimension.Coercible);
+    method public static androidx.compose.foundation.layout.Dimension getAtLeastWrapContent(androidx.compose.foundation.layout.Dimension.MinCoercible);
+    method public static androidx.compose.foundation.layout.Dimension.MinCoercible getAtMostWrapContent(androidx.compose.foundation.layout.Dimension.Coercible);
+    method public static androidx.compose.foundation.layout.Dimension getAtMostWrapContent(androidx.compose.foundation.layout.Dimension.MaxCoercible);
   }
 
-  @androidx.ui.layout.LayoutScopeMarker public final class ConstraintLayoutScope extends androidx.ui.layout.ConstraintLayoutBaseScope {
-    method public androidx.ui.core.Modifier constrainAs(androidx.ui.core.Modifier, androidx.ui.layout.ConstrainedLayoutReference ref, kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstrainScope,kotlin.Unit> constrainBlock);
-    method public androidx.ui.layout.ConstrainedLayoutReference createRef();
-    method public androidx.ui.layout.ConstraintLayoutScope.ConstrainedLayoutReferences createRefs();
+  @androidx.compose.foundation.layout.LayoutScopeMarker public final class ConstraintLayoutScope extends androidx.compose.foundation.layout.ConstraintLayoutBaseScope {
+    method public androidx.ui.core.Modifier constrainAs(androidx.ui.core.Modifier, androidx.compose.foundation.layout.ConstrainedLayoutReference ref, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ConstrainScope,kotlin.Unit> constrainBlock);
+    method public androidx.compose.foundation.layout.ConstrainedLayoutReference createRef();
+    method public androidx.compose.foundation.layout.ConstraintLayoutScope.ConstrainedLayoutReferences createRefs();
   }
 
   public final class ConstraintLayoutScope.ConstrainedLayoutReferences {
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component1();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component10();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component11();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component12();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component13();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component14();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component15();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component16();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component2();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component3();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component4();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component5();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component6();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component7();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component8();
-    method public operator androidx.ui.layout.ConstrainedLayoutReference component9();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component1();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component10();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component11();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component12();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component13();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component14();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component15();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component16();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component2();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component3();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component4();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component5();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component6();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component7();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component8();
+    method public operator androidx.compose.foundation.layout.ConstrainedLayoutReference component9();
   }
 
   @androidx.compose.Immutable public interface ConstraintSet {
-    method public void applyTo(androidx.ui.layout.State state, java.util.List<? extends androidx.ui.core.Measurable> measurables);
+    method public void applyTo(androidx.compose.foundation.layout.State state, java.util.List<? extends androidx.ui.core.Measurable> measurables);
   }
 
   @Deprecated public final class ConstraintSetBuilderScope {
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom-ipo6vVg(float offset);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft-ipo6vVg(float offset);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight-ipo6vVg(float offset);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop-ipo6vVg(float offset);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createRightBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createTopBarrier(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalChain createVerticalChain(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible getMaxWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getMaxWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible getMinWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getMinWrap(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference getParent();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getSpread();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible getWrap();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getWrapFixed();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension max-FmNbr68(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible, float dp);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible max-p2ctyXY(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible, float dp);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension min-O_hxsMo(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible, float dp);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible min-p2ctyXY(androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible, float dp);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension percent(float percent);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference tag(Object tag);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible value-ipo6vVg(float dp);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension valueFixed-ipo6vVg(float dp);
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MinCoercible maxWrap;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension maxWrap;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible minWrap;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension minWrap;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference parent;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension spread;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension.Coercible wrap;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension wrapFixed;
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom-ipo6vVg(float offset);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft-ipo6vVg(float offset);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight-ipo6vVg(float offset);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop-ipo6vVg(float offset);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createRightBarrier(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createTopBarrier(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalChain createVerticalChain(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MinCoercible getMaxWrap(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.Coercible);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension getMaxWrap(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible getMinWrap(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.Coercible);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension getMinWrap(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MinCoercible);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference getParent();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension getSpread();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.Coercible getWrap();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension getWrapFixed();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension max-FDSvgxs(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible, float dp);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MinCoercible max-SAszZ0E(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.Coercible, float dp);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible min-SAszZ0E(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.Coercible, float dp);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension min-_Goc9uA(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MinCoercible, float dp);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension percent(float percent);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference tag(Object tag);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.Coercible value-ipo6vVg(float dp);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension valueFixed-ipo6vVg(float dp);
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MinCoercible maxWrap;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension maxWrap;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.MaxCoercible minWrap;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension minWrap;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference parent;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension spread;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension.Coercible wrap;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension wrapFixed;
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle {
-    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion Companion;
+    field @Deprecated public static final androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle.Companion Companion;
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Packed(float bias);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getPacked();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getSpread();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle getSpreadInside();
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Packed;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle Spread;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle SpreadInside;
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle Packed(float bias);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle getPacked();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle getSpread();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle getSpreadInside();
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle Packed;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle Spread;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.ChainStyle SpreadInside;
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor {
-    method @Deprecated public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor other);
-    method @Deprecated public androidx.ui.layout.State getState();
+    method @Deprecated public infix void constrainTo(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor other);
+    method @Deprecated public androidx.compose.foundation.layout.State getState();
     method @Deprecated public Object getTag();
   }
 
@@ -335,165 +335,165 @@
     method @Deprecated public void center();
     method @Deprecated public void centerHorizontally();
     method @Deprecated public void centerVertically();
-    method @Deprecated public infix void constrainHorizontallyTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
-    method @Deprecated public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
-    method @Deprecated public infix void constrainVerticallyTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor getBaseline();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getHeight();
+    method @Deprecated public infix void constrainHorizontallyTo(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method @Deprecated public infix void constrainTo(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method @Deprecated public infix void constrainVerticallyTo(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor getBaseline();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension getHeight();
     method @Deprecated public float getHorizontalBias();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
     method @Deprecated public Object getTag();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
     method @Deprecated public float getVerticalBias();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.Dimension getWidth();
-    method @Deprecated public void setBaseline(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor p);
-    method @Deprecated public void setBottom(androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor p);
-    method @Deprecated public void setHeight(androidx.ui.layout.ConstraintSetBuilderScope.Dimension value);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension getWidth();
+    method @Deprecated public void setBaseline(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor p);
+    method @Deprecated public void setBottom(androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor p);
+    method @Deprecated public void setHeight(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension value);
     method @Deprecated public void setHorizontalBias(float value);
-    method @Deprecated public void setRight(androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor p);
+    method @Deprecated public void setRight(androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor p);
     method @Deprecated public void setVerticalBias(float value);
-    method @Deprecated public void setWidth(androidx.ui.layout.ConstraintSetBuilderScope.Dimension value);
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor baseline;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension height;
+    method @Deprecated public void setWidth(androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension value);
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutBaselineAnchor baseline;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension height;
     property public final float horizontalBias;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
     property public final float verticalBias;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.Dimension width;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension width;
   }
 
   @Deprecated public static interface ConstraintSetBuilderScope.Dimension {
   }
 
-  @Deprecated public static interface ConstraintSetBuilderScope.Dimension.Coercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  @Deprecated public static interface ConstraintSetBuilderScope.Dimension.Coercible extends androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension {
   }
 
-  @Deprecated public static interface ConstraintSetBuilderScope.Dimension.MaxCoercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  @Deprecated public static interface ConstraintSetBuilderScope.Dimension.MaxCoercible extends androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension {
   }
 
-  @Deprecated public static interface ConstraintSetBuilderScope.Dimension.MinCoercible extends androidx.ui.layout.ConstraintSetBuilderScope.Dimension {
+  @Deprecated public static interface ConstraintSetBuilderScope.Dimension.MinCoercible extends androidx.compose.foundation.layout.ConstraintSetBuilderScope.Dimension {
   }
 
   @Deprecated public abstract static sealed class ConstraintSetBuilderScope.HorizontalAnchor {
   }
 
-  @Deprecated public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+  @Deprecated public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor {
     method @Deprecated public int getIndex$lintWithKotlin();
     method @Deprecated public float getMargin();
-    method @Deprecated public androidx.ui.layout.State getState$lintWithKotlin();
+    method @Deprecated public androidx.compose.foundation.layout.State getState$lintWithKotlin();
     method @Deprecated public Object getTag$lintWithKotlin();
     method @Deprecated public void setMargin-ipo6vVg(float value);
     property public final float margin;
   }
 
-  @Deprecated public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
-    method @Deprecated public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor other);
+  @Deprecated public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+    method @Deprecated public infix void constrainTo(androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor other);
     method @Deprecated public int getIndex$lintWithKotlin();
     method @Deprecated public float getMargin();
-    method @Deprecated public androidx.ui.layout.State getState$lintWithKotlin();
+    method @Deprecated public androidx.compose.foundation.layout.State getState$lintWithKotlin();
     method @Deprecated public Object getTag$lintWithKotlin();
     method @Deprecated public void setMargin-ipo6vVg(float value);
     property public final float margin;
     property public Object tag;
   }
 
-  @Deprecated public static final class ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor {
+  @Deprecated public static final class ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor extends androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor {
     method @Deprecated public int getIndex$lintWithKotlin();
-    method @Deprecated public androidx.ui.layout.State getState$lintWithKotlin();
+    method @Deprecated public androidx.compose.foundation.layout.State getState$lintWithKotlin();
     method @Deprecated public Object getTag$lintWithKotlin();
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.HorizontalChain {
-    method @Deprecated public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
+    method @Deprecated public infix void constrainTo(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getLeft();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor getRight();
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor left;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor right;
   }
 
   @Deprecated public abstract static sealed class ConstraintSetBuilderScope.VerticalAnchor {
   }
 
-  @Deprecated public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+  @Deprecated public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor {
     method @Deprecated public int getIndex$lintWithKotlin();
     method @Deprecated public float getMargin();
-    method @Deprecated public androidx.ui.layout.State getState$lintWithKotlin();
+    method @Deprecated public androidx.compose.foundation.layout.State getState$lintWithKotlin();
     method @Deprecated public Object getTag$lintWithKotlin();
     method @Deprecated public void setMargin-ipo6vVg(float value);
     property public final float margin;
   }
 
-  @Deprecated public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
-    method @Deprecated public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor other);
+  @Deprecated public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor {
+    method @Deprecated public infix void constrainTo(androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor other);
     method @Deprecated public int getIndex$lintWithKotlin();
     method @Deprecated public float getMargin();
-    method @Deprecated public androidx.ui.layout.State getState$lintWithKotlin();
+    method @Deprecated public androidx.compose.foundation.layout.State getState$lintWithKotlin();
     method @Deprecated public Object getTag$lintWithKotlin();
     method @Deprecated public void setMargin-ipo6vVg(float value);
     property public final float margin;
     property public Object tag;
   }
 
-  @Deprecated public static final class ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor extends androidx.ui.layout.ConstraintSetBuilderScope.VerticalAnchor {
+  @Deprecated public static final class ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor extends androidx.compose.foundation.layout.ConstraintSetBuilderScope.VerticalAnchor {
     method @Deprecated public int getIndex$lintWithKotlin();
-    method @Deprecated public androidx.ui.layout.State getState$lintWithKotlin();
+    method @Deprecated public androidx.compose.foundation.layout.State getState$lintWithKotlin();
     method @Deprecated public Object getTag$lintWithKotlin();
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.VerticalChain {
-    method @Deprecated public infix void constrainTo(androidx.ui.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
-    method @Deprecated public androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
-    property public final androidx.ui.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
+    method @Deprecated public infix void constrainTo(androidx.compose.foundation.layout.ConstraintSetBuilderScope.ConstrainedLayoutReference other);
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getBottom();
+    method @Deprecated public androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor getTop();
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor bottom;
+    property public final androidx.compose.foundation.layout.ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor top;
   }
 
-  @androidx.ui.layout.LayoutScopeMarker public final class ConstraintSetScope extends androidx.ui.layout.ConstraintLayoutBaseScope {
-    method public androidx.ui.layout.ConstrainScope constrain(androidx.ui.layout.ConstrainedLayoutReference ref, kotlin.jvm.functions.Function1<? super androidx.ui.layout.ConstrainScope,kotlin.Unit> constrainBlock);
-    method public androidx.ui.layout.ConstrainedLayoutReference createRefFor(Object id);
+  @androidx.compose.foundation.layout.LayoutScopeMarker public final class ConstraintSetScope extends androidx.compose.foundation.layout.ConstraintLayoutBaseScope {
+    method public androidx.compose.foundation.layout.ConstrainScope constrain(androidx.compose.foundation.layout.ConstrainedLayoutReference ref, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.ConstrainScope,kotlin.Unit> constrainBlock);
+    method public androidx.compose.foundation.layout.ConstrainedLayoutReference createRefFor(Object id);
   }
 
   @androidx.compose.Immutable public abstract sealed class CrossAxisAlignment {
-    field public static final androidx.ui.layout.CrossAxisAlignment.Companion Companion;
+    field public static final androidx.compose.foundation.layout.CrossAxisAlignment.Companion Companion;
   }
 
   public static final class CrossAxisAlignment.Companion {
-    method public androidx.ui.layout.CrossAxisAlignment AlignmentLine(androidx.ui.core.AlignmentLine alignmentLine);
-    method public androidx.ui.layout.CrossAxisAlignment getCenter();
-    method public androidx.ui.layout.CrossAxisAlignment getEnd();
-    method public androidx.ui.layout.CrossAxisAlignment getStart();
-    property public final androidx.ui.layout.CrossAxisAlignment Center;
-    property public final androidx.ui.layout.CrossAxisAlignment End;
-    property public final androidx.ui.layout.CrossAxisAlignment Start;
+    method public androidx.compose.foundation.layout.CrossAxisAlignment AlignmentLine(androidx.ui.core.AlignmentLine alignmentLine);
+    method public androidx.compose.foundation.layout.CrossAxisAlignment getCenter();
+    method public androidx.compose.foundation.layout.CrossAxisAlignment getEnd();
+    method public androidx.compose.foundation.layout.CrossAxisAlignment getStart();
+    property public final androidx.compose.foundation.layout.CrossAxisAlignment Center;
+    property public final androidx.compose.foundation.layout.CrossAxisAlignment End;
+    property public final androidx.compose.foundation.layout.CrossAxisAlignment Start;
   }
 
   public interface Dimension {
-    field public static final androidx.ui.layout.Dimension.Companion Companion;
+    field public static final androidx.compose.foundation.layout.Dimension.Companion Companion;
   }
 
-  public static interface Dimension.Coercible extends androidx.ui.layout.Dimension {
+  public static interface Dimension.Coercible extends androidx.compose.foundation.layout.Dimension {
   }
 
   public static final class Dimension.Companion {
-    method public androidx.ui.layout.Dimension getFillToConstraints();
-    method public androidx.ui.layout.Dimension.Coercible getPreferredWrapContent();
-    method public androidx.ui.layout.Dimension getWrapContent();
-    method public androidx.ui.layout.Dimension percent(float percent);
-    method public androidx.ui.layout.Dimension.Coercible preferredValue-ipo6vVg(float dp);
-    method public androidx.ui.layout.Dimension value-ipo6vVg(float dp);
-    property public final androidx.ui.layout.Dimension fillToConstraints;
-    property public final androidx.ui.layout.Dimension.Coercible preferredWrapContent;
-    property public final androidx.ui.layout.Dimension wrapContent;
+    method public androidx.compose.foundation.layout.Dimension getFillToConstraints();
+    method public androidx.compose.foundation.layout.Dimension.Coercible getPreferredWrapContent();
+    method public androidx.compose.foundation.layout.Dimension getWrapContent();
+    method public androidx.compose.foundation.layout.Dimension percent(float percent);
+    method public androidx.compose.foundation.layout.Dimension.Coercible preferredValue-ipo6vVg(float dp);
+    method public androidx.compose.foundation.layout.Dimension value-ipo6vVg(float dp);
+    property public final androidx.compose.foundation.layout.Dimension fillToConstraints;
+    property public final androidx.compose.foundation.layout.Dimension.Coercible preferredWrapContent;
+    property public final androidx.compose.foundation.layout.Dimension wrapContent;
   }
 
-  public static interface Dimension.MaxCoercible extends androidx.ui.layout.Dimension {
+  public static interface Dimension.MaxCoercible extends androidx.compose.foundation.layout.Dimension {
   }
 
-  public static interface Dimension.MinCoercible extends androidx.ui.layout.Dimension {
+  public static interface Dimension.MinCoercible extends androidx.compose.foundation.layout.Dimension {
   }
 
   @androidx.compose.Immutable public final class DpConstraints {
@@ -501,47 +501,47 @@
     method public float component2();
     method public float component3();
     method public float component4();
-    method @androidx.compose.Immutable public androidx.ui.layout.DpConstraints copy-rIHlIKc(float minWidth, float maxWidth, float minHeight, float maxHeight);
+    method @androidx.compose.Immutable public androidx.compose.foundation.layout.DpConstraints copy-rIHlIKc(float minWidth, float maxWidth, float minHeight, float maxHeight);
     method public float getMaxHeight();
     method public float getMaxWidth();
     method public float getMinHeight();
     method public float getMinWidth();
-    field public static final androidx.ui.layout.DpConstraints.Companion Companion;
+    field public static final androidx.compose.foundation.layout.DpConstraints.Companion Companion;
   }
 
   public static final class DpConstraints.Companion {
-    method @androidx.compose.Stable public androidx.ui.layout.DpConstraints fixed-98Cn76g(float width, float height);
-    method @androidx.compose.Stable public androidx.ui.layout.DpConstraints fixedHeight-ipo6vVg(float height);
-    method @androidx.compose.Stable public androidx.ui.layout.DpConstraints fixedWidth-ipo6vVg(float width);
+    method @androidx.compose.Stable public androidx.compose.foundation.layout.DpConstraints fixed-98Cn76g(float width, float height);
+    method @androidx.compose.Stable public androidx.compose.foundation.layout.DpConstraints fixedHeight-ipo6vVg(float height);
+    method @androidx.compose.Stable public androidx.compose.foundation.layout.DpConstraints fixedWidth-ipo6vVg(float width);
   }
 
   public final class DpConstraintsKt {
-    method @androidx.compose.Stable public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.Density, androidx.ui.layout.DpConstraints dpConstraints);
-    method @androidx.compose.Stable public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints);
-    method @androidx.compose.Stable public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
-    method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
-    method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
-    method public static boolean getHasFixedHeight(androidx.ui.layout.DpConstraints);
-    method public static boolean getHasFixedWidth(androidx.ui.layout.DpConstraints);
-    method public static boolean getSatisfiable(androidx.ui.layout.DpConstraints);
-    method public static boolean isZero(androidx.ui.layout.DpConstraints);
-    method @androidx.compose.Stable public static androidx.ui.layout.DpConstraints offset-bB8corQ(androidx.ui.layout.DpConstraints, float horizontal = 0.dp, float vertical = 0.dp);
+    method @androidx.compose.Stable public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.Density, androidx.compose.foundation.layout.DpConstraints dpConstraints);
+    method @androidx.compose.Stable public static androidx.compose.foundation.layout.DpConstraints DpConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints);
+    method @androidx.compose.Stable public static androidx.compose.foundation.layout.DpConstraints enforce(androidx.compose.foundation.layout.DpConstraints, androidx.compose.foundation.layout.DpConstraints otherConstraints);
+    method public static boolean getHasBoundedHeight(androidx.compose.foundation.layout.DpConstraints);
+    method public static boolean getHasBoundedWidth(androidx.compose.foundation.layout.DpConstraints);
+    method public static boolean getHasFixedHeight(androidx.compose.foundation.layout.DpConstraints);
+    method public static boolean getHasFixedWidth(androidx.compose.foundation.layout.DpConstraints);
+    method public static boolean getSatisfiable(androidx.compose.foundation.layout.DpConstraints);
+    method public static boolean isZero(androidx.compose.foundation.layout.DpConstraints);
+    method @androidx.compose.Stable public static androidx.compose.foundation.layout.DpConstraints offset-H8zAE6E(androidx.compose.foundation.layout.DpConstraints, float horizontal = 0.dp, float vertical = 0.dp);
   }
 
   @kotlin.RequiresOptIn(message="The API of this layout is experimental and is likely to change in the future.") public @interface ExperimentalLayout {
   }
 
   public enum FlowCrossAxisAlignment {
-    method public static androidx.ui.layout.FlowCrossAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
-    method public static androidx.ui.layout.FlowCrossAxisAlignment[] values();
-    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
-    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
-    enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
+    method public static androidx.compose.foundation.layout.FlowCrossAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.compose.foundation.layout.FlowCrossAxisAlignment[] values();
+    enum_constant public static final androidx.compose.foundation.layout.FlowCrossAxisAlignment Center;
+    enum_constant public static final androidx.compose.foundation.layout.FlowCrossAxisAlignment End;
+    enum_constant public static final androidx.compose.foundation.layout.FlowCrossAxisAlignment Start;
   }
 
   public final class FlowKt {
-    method @androidx.compose.Composable @androidx.ui.layout.ExperimentalLayout public static void FlowColumn-UKRdXhE(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, float mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, float crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method @androidx.compose.Composable @androidx.ui.layout.ExperimentalLayout public static void FlowRow-UKRdXhE(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, float mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, float crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @androidx.compose.Composable @androidx.compose.foundation.layout.ExperimentalLayout public static void FlowColumn-A2g23mI(androidx.compose.foundation.layout.SizeMode mainAxisSize = androidx.compose.foundation.layout.SizeMode.Wrap, androidx.compose.foundation.layout.MainAxisAlignment mainAxisAlignment = androidx.compose.foundation.layout.MainAxisAlignment.Start, float mainAxisSpacing = 0.dp, androidx.compose.foundation.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.compose.foundation.layout.FlowCrossAxisAlignment.Start, float crossAxisSpacing = 0.dp, androidx.compose.foundation.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+    method @androidx.compose.Composable @androidx.compose.foundation.layout.ExperimentalLayout public static void FlowRow-A2g23mI(androidx.compose.foundation.layout.SizeMode mainAxisSize = androidx.compose.foundation.layout.SizeMode.Wrap, androidx.compose.foundation.layout.MainAxisAlignment mainAxisAlignment = androidx.compose.foundation.layout.MainAxisAlignment.Start, float mainAxisSpacing = 0.dp, androidx.compose.foundation.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.compose.foundation.layout.FlowCrossAxisAlignment.Start, float crossAxisSpacing = 0.dp, androidx.compose.foundation.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
   @androidx.compose.Immutable public final class InnerPadding {
@@ -549,7 +549,7 @@
     method public float component2();
     method public float component3();
     method public float component4();
-    method @androidx.compose.Immutable public androidx.ui.layout.InnerPadding copy-rIHlIKc(float start, float top, float end, float bottom);
+    method @androidx.compose.Immutable public androidx.compose.foundation.layout.InnerPadding copy-rIHlIKc(float start, float top, float end, float bottom);
     method public float getBottom();
     method public float getEnd();
     method public float getStart();
@@ -561,15 +561,15 @@
     method @Deprecated @androidx.compose.Composable public static void MaxIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
     method @Deprecated @androidx.compose.Composable public static void MinIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
     method @Deprecated @androidx.compose.Composable public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
-    method @androidx.compose.Stable @androidx.ui.layout.ExperimentalLayout public static androidx.ui.core.Modifier preferredHeight(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
-    method @androidx.compose.Stable @androidx.ui.layout.ExperimentalLayout public static androidx.ui.core.Modifier preferredWidth(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.Stable @androidx.compose.foundation.layout.ExperimentalLayout public static androidx.ui.core.Modifier preferredHeight(androidx.ui.core.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
+    method @androidx.compose.Stable @androidx.compose.foundation.layout.ExperimentalLayout public static androidx.ui.core.Modifier preferredWidth(androidx.ui.core.Modifier, androidx.compose.foundation.layout.IntrinsicSize intrinsicSize);
   }
 
   public enum IntrinsicSize {
-    method public static androidx.ui.layout.IntrinsicSize valueOf(String name) throws java.lang.IllegalArgumentException;
-    method public static androidx.ui.layout.IntrinsicSize[] values();
-    enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
-    enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
+    method public static androidx.compose.foundation.layout.IntrinsicSize valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.compose.foundation.layout.IntrinsicSize[] values();
+    enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Max;
+    enum_constant public static final androidx.compose.foundation.layout.IntrinsicSize Min;
   }
 
   public final class LayoutAspectRatioKt {
@@ -588,7 +588,7 @@
 
   public final class LayoutPaddingKt {
     method @androidx.compose.Stable public static androidx.ui.core.Modifier absolutePadding-AwkAAmk(androidx.ui.core.Modifier, float left = 0.dp, float top = 0.dp, float right = 0.dp, float bottom = 0.dp);
-    method public static androidx.ui.core.Modifier padding(androidx.ui.core.Modifier, androidx.ui.layout.InnerPadding padding);
+    method public static androidx.ui.core.Modifier padding(androidx.ui.core.Modifier, androidx.compose.foundation.layout.InnerPadding padding);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier padding-AwkAAmk(androidx.ui.core.Modifier, float start = 0.dp, float top = 0.dp, float end = 0.dp, float bottom = 0.dp);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier padding-H3qe284(androidx.ui.core.Modifier, float all);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier padding-qJOR85M(androidx.ui.core.Modifier, float horizontal = 0.dp, float vertical = 0.dp);
@@ -608,13 +608,13 @@
     method @androidx.compose.Stable public static androidx.ui.core.Modifier preferredHeightIn-qJOR85M(androidx.ui.core.Modifier, float minHeight = Dp.Unspecified, float maxHeight = Dp.Unspecified);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier preferredSize-H3qe284(androidx.ui.core.Modifier, float size);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier preferredSize-qJOR85M(androidx.ui.core.Modifier, float width, float height);
-    method @androidx.compose.Stable public static androidx.ui.core.Modifier preferredSizeIn(androidx.ui.core.Modifier, androidx.ui.layout.DpConstraints constraints);
+    method @androidx.compose.Stable public static androidx.ui.core.Modifier preferredSizeIn(androidx.ui.core.Modifier, androidx.compose.foundation.layout.DpConstraints constraints);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier preferredSizeIn-AwkAAmk(androidx.ui.core.Modifier, float minWidth = Dp.Unspecified, float minHeight = Dp.Unspecified, float maxWidth = Dp.Unspecified, float maxHeight = Dp.Unspecified);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier preferredWidth-H3qe284(androidx.ui.core.Modifier, float width);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier preferredWidthIn-qJOR85M(androidx.ui.core.Modifier, float minWidth = Dp.Unspecified, float maxWidth = Dp.Unspecified);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier size-H3qe284(androidx.ui.core.Modifier, float size);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier size-qJOR85M(androidx.ui.core.Modifier, float width, float height);
-    method @androidx.compose.Stable public static androidx.ui.core.Modifier sizeIn(androidx.ui.core.Modifier, androidx.ui.layout.DpConstraints constraints);
+    method @androidx.compose.Stable public static androidx.ui.core.Modifier sizeIn(androidx.ui.core.Modifier, androidx.compose.foundation.layout.DpConstraints constraints);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier sizeIn-AwkAAmk(androidx.ui.core.Modifier, float minWidth = Dp.Unspecified, float minHeight = Dp.Unspecified, float maxWidth = Dp.Unspecified, float maxHeight = Dp.Unspecified);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier width-H3qe284(androidx.ui.core.Modifier, float width);
     method @androidx.compose.Stable public static androidx.ui.core.Modifier widthIn-qJOR85M(androidx.ui.core.Modifier, float minWidth = Dp.Unspecified, float maxWidth = Dp.Unspecified);
@@ -624,36 +624,36 @@
   }
 
   public enum MainAxisAlignment {
-    method public static androidx.ui.layout.MainAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
-    method public static androidx.ui.layout.MainAxisAlignment[] values();
-    enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
-    enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
-    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
-    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceBetween;
-    enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceEvenly;
-    enum_constant public static final androidx.ui.layout.MainAxisAlignment Start;
+    method public static androidx.compose.foundation.layout.MainAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.compose.foundation.layout.MainAxisAlignment[] values();
+    enum_constant public static final androidx.compose.foundation.layout.MainAxisAlignment Center;
+    enum_constant public static final androidx.compose.foundation.layout.MainAxisAlignment End;
+    enum_constant public static final androidx.compose.foundation.layout.MainAxisAlignment SpaceAround;
+    enum_constant public static final androidx.compose.foundation.layout.MainAxisAlignment SpaceBetween;
+    enum_constant public static final androidx.compose.foundation.layout.MainAxisAlignment SpaceEvenly;
+    enum_constant public static final androidx.compose.foundation.layout.MainAxisAlignment Start;
   }
 
   public final class RowColumnImplKt {
   }
 
   public final class RowKt {
-    method @androidx.compose.Composable public static void Row(androidx.ui.core.Modifier modifier = Modifier, androidx.ui.layout.Arrangement.Horizontal horizontalArrangement = Arrangement.Start, androidx.ui.core.Alignment.Vertical verticalGravity = Alignment.Top, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> children);
+    method @androidx.compose.Composable public static void Row(androidx.ui.core.Modifier modifier = Modifier, androidx.compose.foundation.layout.Arrangement.Horizontal horizontalArrangement = Arrangement.Start, androidx.ui.core.Alignment.Vertical verticalGravity = Alignment.Top, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.RowScope,kotlin.Unit> children);
   }
 
-  @androidx.compose.Immutable @androidx.ui.layout.LayoutScopeMarker public final class RowScope {
+  @androidx.compose.Immutable @androidx.compose.foundation.layout.LayoutScopeMarker public final class RowScope {
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, androidx.ui.core.HorizontalAlignmentLine alignmentLine);
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, to=3.4E38, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.RowScope INSTANCE;
+    field public static final androidx.compose.foundation.layout.RowScope INSTANCE;
   }
 
   public enum SizeMode {
-    method public static androidx.ui.layout.SizeMode valueOf(String name) throws java.lang.IllegalArgumentException;
-    method public static androidx.ui.layout.SizeMode[] values();
-    enum_constant public static final androidx.ui.layout.SizeMode Expand;
-    enum_constant public static final androidx.ui.layout.SizeMode Wrap;
+    method public static androidx.compose.foundation.layout.SizeMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.compose.foundation.layout.SizeMode[] values();
+    enum_constant public static final androidx.compose.foundation.layout.SizeMode Expand;
+    enum_constant public static final androidx.compose.foundation.layout.SizeMode Wrap;
   }
 
   public final class SpacerKt {
@@ -661,10 +661,10 @@
   }
 
   public final class StackKt {
-    method @androidx.compose.Composable public static void Stack(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.layout.StackScope,kotlin.Unit> children);
+    method @androidx.compose.Composable public static void Stack(androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.StackScope,kotlin.Unit> children);
   }
 
-  @androidx.compose.Immutable @androidx.ui.layout.LayoutScopeMarker public final class StackScope {
+  @androidx.compose.Immutable @androidx.compose.foundation.layout.LayoutScopeMarker public final class StackScope {
     ctor public StackScope();
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier matchParentSize(androidx.ui.core.Modifier);