Refactors androidx.compose.ui:ui-text to the androidx.compose.ui.text package name
Bug: b/160233169
Test: ./gradlew checkApi
Relnote: N/A
Change-Id: Ide9b7d12c9f46dac717a602592bd168312253ce6
diff --git a/ui/ui-core/api/0.1.0-dev16.txt b/ui/ui-core/api/0.1.0-dev16.txt
index a3c819d..18c76b6 100644
--- a/ui/ui-core/api/0.1.0-dev16.txt
+++ b/ui/ui-core/api/0.1.0-dev16.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -658,14 +668,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -685,14 +695,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -924,8 +934,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1897,7 +1907,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1910,16 +1920,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2197,16 +2207,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2262,9 +2262,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2338,23 +2338,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2367,8 +2367,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2377,8 +2377,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2390,9 +2390,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2407,9 +2407,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/current.txt b/ui/ui-core/api/current.txt
index a3c819d..18c76b6 100644
--- a/ui/ui-core/api/current.txt
+++ b/ui/ui-core/api/current.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -658,14 +668,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -685,14 +695,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -924,8 +934,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1897,7 +1907,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1910,16 +1920,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2197,16 +2207,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2262,9 +2262,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2338,23 +2338,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2367,8 +2367,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2377,8 +2377,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2390,9 +2390,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2407,9 +2407,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/public_plus_experimental_0.1.0-dev16.txt b/ui/ui-core/api/public_plus_experimental_0.1.0-dev16.txt
index a3c819d..18c76b6 100644
--- a/ui/ui-core/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/ui/ui-core/api/public_plus_experimental_0.1.0-dev16.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -658,14 +668,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -685,14 +695,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -924,8 +934,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1897,7 +1907,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1910,16 +1920,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2197,16 +2207,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2262,9 +2262,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2338,23 +2338,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2367,8 +2367,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2377,8 +2377,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2390,9 +2390,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2407,9 +2407,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/public_plus_experimental_current.txt b/ui/ui-core/api/public_plus_experimental_current.txt
index a3c819d..18c76b6 100644
--- a/ui/ui-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-core/api/public_plus_experimental_current.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -658,14 +668,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -685,14 +695,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -924,8 +934,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1897,7 +1907,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1910,16 +1920,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2197,16 +2207,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2262,9 +2262,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2338,23 +2338,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2367,8 +2367,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2377,8 +2377,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2390,9 +2390,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2407,9 +2407,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/restricted_0.1.0-dev16.txt b/ui/ui-core/api/restricted_0.1.0-dev16.txt
index 4c18808..5eb7dc8 100644
--- a/ui/ui-core/api/restricted_0.1.0-dev16.txt
+++ b/ui/ui-core/api/restricted_0.1.0-dev16.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -721,14 +731,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -748,14 +758,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -987,8 +997,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1960,7 +1970,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1973,16 +1983,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2260,16 +2270,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2334,9 +2334,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2410,23 +2410,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2439,8 +2439,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2449,8 +2449,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2462,9 +2462,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2479,9 +2479,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/restricted_current.txt b/ui/ui-core/api/restricted_current.txt
index 4c18808..5eb7dc8 100644
--- a/ui/ui-core/api/restricted_current.txt
+++ b/ui/ui-core/api/restricted_current.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -721,14 +731,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -748,14 +758,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -987,8 +997,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1960,7 +1970,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1973,16 +1983,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2260,16 +2270,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2334,9 +2334,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2410,23 +2410,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2439,8 +2439,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2449,8 +2449,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2462,9 +2462,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2479,9 +2479,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt
index 5f296da..23a3264 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt
@@ -41,10 +41,10 @@
import androidx.ui.core.Modifier
import androidx.ui.core.Popup
import androidx.ui.graphics.Color
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt
index e8b062b..1e959f9 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt
@@ -32,9 +32,9 @@
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Text
import androidx.ui.geometry.Offset
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.preferredHeight
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/PopupDragDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/PopupDragDemo.kt
index d504157..1d1519c 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/PopupDragDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/PopupDragDemo.kt
@@ -32,7 +32,7 @@
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Stack
import androidx.compose.foundation.layout.preferredSize
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.geometry.Offset
import androidx.ui.unit.dp
import androidx.ui.unit.round
diff --git a/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/FontResourcesSample.kt b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/FontResourcesSample.kt
index d3b9466..d840068 100644
--- a/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/FontResourcesSample.kt
+++ b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/FontResourcesSample.kt
@@ -21,8 +21,8 @@
import androidx.compose.foundation.Text
import androidx.ui.res.fontResource
import androidx.ui.res.loadFontResource
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.LoadedFontFamily
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.LoadedFontFamily
@Sampled
@Composable
diff --git a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/input/RecordingInputConnectionTest.kt b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionTest.kt
similarity index 99%
rename from ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/input/RecordingInputConnectionTest.kt
rename to ui/ui-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionTest.kt
index 3822762..228b2ae 100644
--- a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/input/RecordingInputConnectionTest.kt
+++ b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.view.KeyEvent
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.argumentCaptor
import com.nhaarman.mockitokotlin2.mock
diff --git a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/core/selection/SelectionHandlesTest.kt b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/core/selection/SelectionHandlesTest.kt
index 41b9fbd..6d812c3 100644
--- a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/core/selection/SelectionHandlesTest.kt
+++ b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/core/selection/SelectionHandlesTest.kt
@@ -26,8 +26,8 @@
import androidx.ui.framework.test.TestActivity
import androidx.ui.graphics.Color
import androidx.ui.graphics.toArgb
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.style.ResolvedTextDirection
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.mock
import org.junit.Before
diff --git a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/res/FontResourcesTest.kt b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/res/FontResourcesTest.kt
index 153318d..64511fb 100644
--- a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/res/FontResourcesTest.kt
+++ b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/res/FontResourcesTest.kt
@@ -22,13 +22,13 @@
import androidx.ui.core.ContextAmbient
import androidx.ui.test.createComposeRule
import androidx.ui.test.runOnIdle
-import androidx.ui.text.Typeface
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.font.font
-import androidx.ui.text.font.fontFamily
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.Typeface
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.text.font.fontFamily
+import androidx.compose.ui.text.font.test.R
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/InputState.kt b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/InputState.kt
similarity index 96%
rename from ui/ui-core/src/androidMain/kotlin/androidx/ui/input/InputState.kt
rename to ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/InputState.kt
index 64469cf..e8fc13b 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/InputState.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/InputState.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.view.inputmethod.ExtractedText
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/RecordingInputConnection.kt b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/RecordingInputConnection.kt
similarity index 99%
rename from ui/ui-core/src/androidMain/kotlin/androidx/ui/input/RecordingInputConnection.kt
rename to ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/RecordingInputConnection.kt
index b067b86..eebdad6 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/RecordingInputConnection.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/RecordingInputConnection.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.os.Bundle
import android.os.Handler
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/TextInputServiceAndroid.kt b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.kt
similarity index 98%
rename from ui/ui-core/src/androidMain/kotlin/androidx/ui/input/TextInputServiceAndroid.kt
rename to ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.kt
index 8ce0ef6b..172194a 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/TextInputServiceAndroid.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.content.Context
import android.text.InputType
@@ -24,7 +24,7 @@
import android.view.inputmethod.InputConnection
import android.view.inputmethod.InputMethodManager
import androidx.ui.geometry.Rect
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import kotlin.math.roundToInt
/**
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
index 77f4b83..b532bff 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
@@ -81,11 +81,11 @@
import androidx.ui.core.texttoolbar.TextToolbar
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.CanvasHolder
-import androidx.ui.input.TextInputServiceAndroid
-import androidx.ui.input.textInputServiceFactory
+import androidx.compose.ui.text.input.TextInputServiceAndroid
+import androidx.compose.ui.text.input.textInputServiceFactory
import androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry
import androidx.ui.core.LayoutNode.UsageByParent
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import androidx.ui.unit.Density
import androidx.ui.unit.IntOffset
import androidx.ui.util.fastForEach
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
index f23f474..8598acf 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
@@ -48,9 +48,9 @@
import androidx.ui.semantics.SemanticsActions
import androidx.ui.semantics.SemanticsActions.CustomActions
import androidx.ui.semantics.SemanticsProperties
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.length
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.length
import androidx.ui.unit.toRect
import androidx.ui.util.fastForEach
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/clipboard/AndroidClipboardManager.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/clipboard/AndroidClipboardManager.kt
index add5b41..18e9905 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/clipboard/AndroidClipboardManager.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/clipboard/AndroidClipboardManager.kt
@@ -18,7 +18,7 @@
import android.content.ClipData
import android.content.Context
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
private const val PLAIN_TEXT_LABEL = "plain text"
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/text/AndroidFontResourceLoader.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/text/AndroidFontResourceLoader.kt
index 8796454..ea89e8d 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/text/AndroidFontResourceLoader.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/text/AndroidFontResourceLoader.kt
@@ -19,8 +19,8 @@
import android.content.Context
import android.graphics.Typeface
import androidx.core.content.res.ResourcesCompat
-import androidx.ui.text.font.Font
-import androidx.ui.text.font.ResourceFont
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.ResourceFont
/**
* Android implementation for [Font.ResourceLoader]
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/res/FontResources.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/res/FontResources.kt
index 029768f..0320fc9 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/res/FontResources.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/res/FontResources.kt
@@ -21,13 +21,13 @@
import androidx.annotation.GuardedBy
import androidx.compose.Composable
import androidx.ui.core.ContextAmbient
-import androidx.ui.text.Typeface
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontListFontFamily
-import androidx.ui.text.font.LoadedFontFamily
-import androidx.ui.text.font.ResourceFont
-import androidx.ui.text.font.SystemFontFamily
-import androidx.ui.text.platform.typefaceFromFontFamily
+import androidx.compose.ui.text.Typeface
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontListFontFamily
+import androidx.compose.ui.text.font.LoadedFontFamily
+import androidx.compose.ui.text.font.ResourceFont
+import androidx.compose.ui.text.font.SystemFontFamily
+import androidx.compose.ui.text.platform.typefaceFromFontFamily
import androidx.ui.util.fastForEach
private val cacheLock = Object()
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Ambients.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Ambients.kt
index 039bdf3..a61ddab 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Ambients.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Ambients.kt
@@ -24,9 +24,9 @@
import androidx.ui.core.clipboard.ClipboardManager
import androidx.ui.core.hapticfeedback.HapticFeedback
import androidx.ui.core.texttoolbar.TextToolbar
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.TextInputService
import androidx.ui.platform.UriHandler
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import androidx.ui.unit.Density
import kotlin.coroutines.CoroutineContext
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Owner.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Owner.kt
index b9d76cc..4c7ab3c 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Owner.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Owner.kt
@@ -24,9 +24,9 @@
import androidx.ui.core.semantics.SemanticsOwner
import androidx.ui.core.texttoolbar.TextToolbar
import androidx.ui.graphics.Canvas
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.TextInputService
import androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import androidx.ui.unit.Density
import androidx.ui.unit.IntOffset
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/clipboard/ClipboardManager.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/clipboard/ClipboardManager.kt
index 7608444..63414ae 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/clipboard/ClipboardManager.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/clipboard/ClipboardManager.kt
@@ -16,7 +16,7 @@
package androidx.ui.core.clipboard
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
/**
* Interface for managing the Clipboard.
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selectable.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selectable.kt
index f585a98..98bbf1c1 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selectable.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selectable.kt
@@ -18,7 +18,7 @@
import androidx.ui.core.LayoutCoordinates
import androidx.ui.geometry.Rect
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
import androidx.ui.geometry.Offset
/**
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selection.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selection.kt
index 860b854..0e1c3be 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selection.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selection.kt
@@ -17,8 +17,8 @@
package androidx.ui.core.selection
import androidx.compose.Immutable
-import androidx.ui.text.TextRange
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.style.ResolvedTextDirection
/**
* Information about the current Selection.
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionContainer.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionContainer.kt
index ec1898b..d36932f 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionContainer.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionContainer.kt
@@ -28,7 +28,7 @@
import androidx.ui.core.gesture.longPressDragGestureFilter
import androidx.ui.core.gesture.tapGestureFilter
import androidx.ui.core.onPositioned
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
/**
* Default SelectionContainer to be used in order to make composables selectable by default.
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionHandles.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionHandles.kt
index d61fd6a..fe1b48f 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionHandles.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionHandles.kt
@@ -26,8 +26,8 @@
import androidx.ui.graphics.Color
import androidx.ui.graphics.Path
import androidx.ui.graphics.drawscope.DrawScope
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Density
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionLayout.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionLayout.kt
index 2a40746..16058a1 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionLayout.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionLayout.kt
@@ -31,8 +31,8 @@
import androidx.ui.core.hasFixedHeight
import androidx.ui.core.hasFixedWidth
import androidx.ui.geometry.Offset
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Dp
import androidx.ui.unit.IntOffset
import androidx.ui.unit.IntSize
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionManager.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionManager.kt
index 51f5a9e..7d54b9f 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionManager.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionManager.kt
@@ -30,11 +30,11 @@
import androidx.ui.core.texttoolbar.TextToolbar
import androidx.ui.core.texttoolbar.TextToolbarStatus
import androidx.ui.geometry.Rect
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.length
-import androidx.ui.text.subSequence
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.length
+import androidx.compose.ui.text.subSequence
import androidx.ui.geometry.Offset
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
import kotlin.math.max
import kotlin.math.min
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
index 98c1c85..2b9abb5 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
@@ -16,9 +16,9 @@
package androidx.ui.semantics
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
import kotlin.reflect.KProperty
/**
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt b/ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
similarity index 97%
rename from ui/ui-core/src/test/kotlin/androidx/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
rename to ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
index 9962e57..481b8c2 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.view.View
import android.view.inputmethod.ExtractedText
import android.view.inputmethod.InputConnection
import android.view.inputmethod.InputMethodManager
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.argumentCaptor
import com.nhaarman.mockitokotlin2.eq
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/input/TextInputServiceAndroidTest.kt b/ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidTest.kt
similarity index 99%
rename from ui/ui-core/src/test/kotlin/androidx/ui/input/TextInputServiceAndroidTest.kt
rename to ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidTest.kt
index 200bf5b..b004c8c 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/input/TextInputServiceAndroidTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.content.Context
import android.text.InputType
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerDragTest.kt b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerDragTest.kt
index 7b54831..83fedf9 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerDragTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerDragTest.kt
@@ -18,7 +18,7 @@
import androidx.test.filters.SmallTest
import androidx.ui.core.LayoutCoordinates
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.geometry.Offset
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerLongPressDragTest.kt b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerLongPressDragTest.kt
index 0cc31cb..473a7ce 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerLongPressDragTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerLongPressDragTest.kt
@@ -18,7 +18,7 @@
import androidx.test.filters.SmallTest
import androidx.ui.core.LayoutCoordinates
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.geometry.Offset
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerTest.kt b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerTest.kt
index f5a33f9..cf282f9 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerTest.kt
@@ -23,10 +23,10 @@
import androidx.ui.core.hapticfeedback.HapticFeedbackType
import androidx.ui.core.texttoolbar.TextToolbar
import androidx.ui.geometry.Rect
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.length
-import androidx.ui.text.style.ResolvedTextDirection
-import androidx.ui.text.subSequence
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.length
+import androidx.compose.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.subSequence
import androidx.ui.geometry.Offset
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionTest.kt b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionTest.kt
index 00f0ac4..42d966e 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionTest.kt
@@ -17,8 +17,8 @@
package androidx.ui.core.selection
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.style.ResolvedTextDirection
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.mock
import org.junit.Test