Add modifiers for intrinsic sizing
The CL adds modifiers for sizing to intrinsic measurements, and
deprecates the existing components serving this purpose.
Relnote: Added modifiers for sizing to intrinsic measurements and deprecated the components serving this purpose.
Bug: 150137448
Bug: 143755052
Test: ran ui-layout tests
Change-Id: I8295d57e17ba8ca83ea170713fc57ea7baea52fb
diff --git a/ui/ui-layout/api/restricted_current.txt b/ui/ui-layout/api/restricted_current.txt
index b66344e..5ca9a9c 100644
--- a/ui/ui-layout/api/restricted_current.txt
+++ b/ui/ui-layout/api/restricted_current.txt
@@ -354,10 +354,17 @@
}
public final class IntrinsicKt {
- method public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void MaxIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void MinIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void MaxIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void MaxIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void MinIntrinsicHeight(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void MinIntrinsicWidth(kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static androidx.ui.core.Modifier preferredHeight(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
+ method public static androidx.ui.core.Modifier preferredWidth(androidx.ui.core.Modifier, androidx.ui.layout.IntrinsicSize intrinsicSize);
+ }
+
+ public enum IntrinsicSize {
+ enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
+ enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
}
public final class LayoutAlign {