Merge "Deprecate Old Autofill APIs" into androidx-main
diff --git a/compose/ui/ui/api/current.txt b/compose/ui/ui/api/current.txt
index 2b88ca8..b2b5534 100644
--- a/compose/ui/ui/api/current.txt
+++ b/compose/ui/ui/api/current.txt
@@ -220,9 +220,9 @@
package androidx.compose.ui.autofill {
- public interface Autofill {
- method public void cancelAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
- method public void requestAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
+ @Deprecated public interface Autofill {
+ method @Deprecated public void cancelAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
+ method @Deprecated public void requestAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
}
public abstract class AutofillManager {
@@ -230,64 +230,64 @@
method public abstract void commit();
}
- public final class AutofillNode {
- ctor public AutofillNode(optional java.util.List<? extends androidx.compose.ui.autofill.AutofillType> autofillTypes, optional androidx.compose.ui.geometry.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
- method public java.util.List<androidx.compose.ui.autofill.AutofillType> getAutofillTypes();
- method public androidx.compose.ui.geometry.Rect? getBoundingBox();
- method public int getId();
- method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? getOnFill();
- method public void setBoundingBox(androidx.compose.ui.geometry.Rect?);
- property public final java.util.List<androidx.compose.ui.autofill.AutofillType> autofillTypes;
- property public final androidx.compose.ui.geometry.Rect? boundingBox;
- property public final int id;
- property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? onFill;
+ @Deprecated public final class AutofillNode {
+ ctor @Deprecated public AutofillNode(optional java.util.List<? extends androidx.compose.ui.autofill.AutofillType> autofillTypes, optional androidx.compose.ui.geometry.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+ method @Deprecated public java.util.List<androidx.compose.ui.autofill.AutofillType> getAutofillTypes();
+ method @Deprecated public androidx.compose.ui.geometry.Rect? getBoundingBox();
+ method @Deprecated public int getId();
+ method @Deprecated public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? getOnFill();
+ method @Deprecated public void setBoundingBox(androidx.compose.ui.geometry.Rect?);
+ property @Deprecated public final java.util.List<androidx.compose.ui.autofill.AutofillType> autofillTypes;
+ property @Deprecated public final androidx.compose.ui.geometry.Rect? boundingBox;
+ property @Deprecated public final int id;
+ property @Deprecated public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? onFill;
}
- public final class AutofillTree {
- ctor public AutofillTree();
- method public java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> getChildren();
- method public kotlin.Unit? performAutofill(int id, String value);
- method public operator void plusAssign(androidx.compose.ui.autofill.AutofillNode autofillNode);
- property public final java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> children;
+ @Deprecated public final class AutofillTree {
+ ctor @Deprecated public AutofillTree();
+ method @Deprecated public java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> getChildren();
+ method @Deprecated public kotlin.Unit? performAutofill(int id, String value);
+ method @Deprecated public operator void plusAssign(androidx.compose.ui.autofill.AutofillNode autofillNode);
+ property @Deprecated public final java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> children;
}
- public enum AutofillType {
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressAuxiliaryDetails;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressCountry;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressLocality;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressRegion;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressStreet;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateDay;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateFull;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateMonth;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateYear;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDate;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDay;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationMonth;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationYear;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardNumber;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardSecurityCode;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType EmailAddress;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType Gender;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType NewPassword;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType NewUsername;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType Password;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonFirstName;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonFullName;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonLastName;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonMiddleInitial;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonMiddleName;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonNamePrefix;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonNameSuffix;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneCountryCode;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumber;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumberDevice;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumberNational;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalAddress;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalCode;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalCodeExtended;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType SmsOtpCode;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType Username;
+ @Deprecated public enum AutofillType {
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressAuxiliaryDetails;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressCountry;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressLocality;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressRegion;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressStreet;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType BirthDateDay;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType BirthDateFull;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType BirthDateMonth;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType BirthDateYear;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDate;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDay;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationMonth;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationYear;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardNumber;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardSecurityCode;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType EmailAddress;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType Gender;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType NewPassword;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType NewUsername;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType Password;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonFirstName;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonFullName;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonLastName;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonMiddleInitial;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonMiddleName;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonNamePrefix;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonNameSuffix;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PhoneCountryCode;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PhoneNumber;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PhoneNumberDevice;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PhoneNumberNational;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PostalAddress;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PostalCode;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PostalCodeExtended;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType SmsOtpCode;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType Username;
}
@kotlin.jvm.JvmInline public final value class ContentDataType {
@@ -3202,9 +3202,9 @@
public final class CompositionLocalsKt {
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager?> getLocalAccessibilityManager();
- method @SuppressCompatibility @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill?> getLocalAutofill();
+ method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill?> getLocalAutofill();
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillManager?> getLocalAutofillManager();
- method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> getLocalAutofillTree();
+ method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> getLocalAutofillTree();
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.Clipboard> getLocalClipboard();
method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> getLocalClipboardManager();
method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> getLocalCursorBlinkEnabled();
@@ -3223,9 +3223,9 @@
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> getLocalViewConfiguration();
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> getLocalWindowInfo();
property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager?> LocalAccessibilityManager;
- property @SuppressCompatibility @androidx.compose.ui.ExperimentalComposeUiApi public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill?> LocalAutofill;
+ property @Deprecated public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill?> LocalAutofill;
property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillManager?> LocalAutofillManager;
- property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> LocalAutofillTree;
+ property @Deprecated public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> LocalAutofillTree;
property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.Clipboard> LocalClipboard;
property @Deprecated public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> LocalClipboardManager;
property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> LocalCursorBlinkEnabled;
diff --git a/compose/ui/ui/api/restricted_current.txt b/compose/ui/ui/api/restricted_current.txt
index 8b114f0..f381fac 100644
--- a/compose/ui/ui/api/restricted_current.txt
+++ b/compose/ui/ui/api/restricted_current.txt
@@ -220,9 +220,9 @@
package androidx.compose.ui.autofill {
- public interface Autofill {
- method public void cancelAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
- method public void requestAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
+ @Deprecated public interface Autofill {
+ method @Deprecated public void cancelAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
+ method @Deprecated public void requestAutofillForNode(androidx.compose.ui.autofill.AutofillNode autofillNode);
}
public abstract class AutofillManager {
@@ -230,64 +230,64 @@
method public abstract void commit();
}
- public final class AutofillNode {
- ctor public AutofillNode(optional java.util.List<? extends androidx.compose.ui.autofill.AutofillType> autofillTypes, optional androidx.compose.ui.geometry.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
- method public java.util.List<androidx.compose.ui.autofill.AutofillType> getAutofillTypes();
- method public androidx.compose.ui.geometry.Rect? getBoundingBox();
- method public int getId();
- method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? getOnFill();
- method public void setBoundingBox(androidx.compose.ui.geometry.Rect?);
- property public final java.util.List<androidx.compose.ui.autofill.AutofillType> autofillTypes;
- property public final androidx.compose.ui.geometry.Rect? boundingBox;
- property public final int id;
- property public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? onFill;
+ @Deprecated public final class AutofillNode {
+ ctor @Deprecated public AutofillNode(optional java.util.List<? extends androidx.compose.ui.autofill.AutofillType> autofillTypes, optional androidx.compose.ui.geometry.Rect? boundingBox, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit>? onFill);
+ method @Deprecated public java.util.List<androidx.compose.ui.autofill.AutofillType> getAutofillTypes();
+ method @Deprecated public androidx.compose.ui.geometry.Rect? getBoundingBox();
+ method @Deprecated public int getId();
+ method @Deprecated public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? getOnFill();
+ method @Deprecated public void setBoundingBox(androidx.compose.ui.geometry.Rect?);
+ property @Deprecated public final java.util.List<androidx.compose.ui.autofill.AutofillType> autofillTypes;
+ property @Deprecated public final androidx.compose.ui.geometry.Rect? boundingBox;
+ property @Deprecated public final int id;
+ property @Deprecated public final kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit>? onFill;
}
- public final class AutofillTree {
- ctor public AutofillTree();
- method public java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> getChildren();
- method public kotlin.Unit? performAutofill(int id, String value);
- method public operator void plusAssign(androidx.compose.ui.autofill.AutofillNode autofillNode);
- property public final java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> children;
+ @Deprecated public final class AutofillTree {
+ ctor @Deprecated public AutofillTree();
+ method @Deprecated public java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> getChildren();
+ method @Deprecated public kotlin.Unit? performAutofill(int id, String value);
+ method @Deprecated public operator void plusAssign(androidx.compose.ui.autofill.AutofillNode autofillNode);
+ property @Deprecated public final java.util.Map<java.lang.Integer,androidx.compose.ui.autofill.AutofillNode> children;
}
- public enum AutofillType {
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressAuxiliaryDetails;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressCountry;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressLocality;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressRegion;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType AddressStreet;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateDay;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateFull;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateMonth;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType BirthDateYear;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDate;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDay;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationMonth;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationYear;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardNumber;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType CreditCardSecurityCode;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType EmailAddress;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType Gender;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType NewPassword;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType NewUsername;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType Password;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonFirstName;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonFullName;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonLastName;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonMiddleInitial;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonMiddleName;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonNamePrefix;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PersonNameSuffix;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneCountryCode;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumber;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumberDevice;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PhoneNumberNational;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalAddress;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalCode;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType PostalCodeExtended;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType SmsOtpCode;
- enum_constant public static final androidx.compose.ui.autofill.AutofillType Username;
+ @Deprecated public enum AutofillType {
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressAuxiliaryDetails;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressCountry;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressLocality;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressRegion;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType AddressStreet;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType BirthDateDay;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType BirthDateFull;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType BirthDateMonth;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType BirthDateYear;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDate;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationDay;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationMonth;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardExpirationYear;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardNumber;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType CreditCardSecurityCode;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType EmailAddress;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType Gender;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType NewPassword;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType NewUsername;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType Password;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonFirstName;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonFullName;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonLastName;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonMiddleInitial;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonMiddleName;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonNamePrefix;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PersonNameSuffix;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PhoneCountryCode;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PhoneNumber;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PhoneNumberDevice;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PhoneNumberNational;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PostalAddress;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PostalCode;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType PostalCodeExtended;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType SmsOtpCode;
+ enum_constant @Deprecated public static final androidx.compose.ui.autofill.AutofillType Username;
}
@kotlin.jvm.JvmInline public final value class ContentDataType {
@@ -3256,9 +3256,9 @@
public final class CompositionLocalsKt {
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager?> getLocalAccessibilityManager();
- method @SuppressCompatibility @androidx.compose.ui.ExperimentalComposeUiApi public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill?> getLocalAutofill();
+ method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill?> getLocalAutofill();
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillManager?> getLocalAutofillManager();
- method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> getLocalAutofillTree();
+ method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> getLocalAutofillTree();
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.Clipboard> getLocalClipboard();
method @Deprecated public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> getLocalClipboardManager();
method public static androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> getLocalCursorBlinkEnabled();
@@ -3277,9 +3277,9 @@
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ViewConfiguration> getLocalViewConfiguration();
method public static androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.WindowInfo> getLocalWindowInfo();
property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.AccessibilityManager?> LocalAccessibilityManager;
- property @SuppressCompatibility @androidx.compose.ui.ExperimentalComposeUiApi public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill?> LocalAutofill;
+ property @Deprecated public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.Autofill?> LocalAutofill;
property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillManager?> LocalAutofillManager;
- property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> LocalAutofillTree;
+ property @Deprecated public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.autofill.AutofillTree> LocalAutofillTree;
property public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.Clipboard> LocalClipboard;
property @Deprecated public static final androidx.compose.runtime.ProvidableCompositionLocal<androidx.compose.ui.platform.ClipboardManager> LocalClipboardManager;
property public static final androidx.compose.runtime.ProvidableCompositionLocal<java.lang.Boolean> LocalCursorBlinkEnabled;
diff --git a/compose/ui/ui/benchmark/src/androidTest/java/androidx/compose/ui/benchmark/autofill/AndroidAutofillBenchmark.kt b/compose/ui/ui/benchmark/src/androidTest/java/androidx/compose/ui/benchmark/autofill/AndroidAutofillBenchmark.kt
index d4ba384..6677cd4 100644
--- a/compose/ui/ui/benchmark/src/androidTest/java/androidx/compose/ui/benchmark/autofill/AndroidAutofillBenchmark.kt
+++ b/compose/ui/ui/benchmark/src/androidTest/java/androidx/compose/ui/benchmark/autofill/AndroidAutofillBenchmark.kt
@@ -41,13 +41,15 @@
@get:Rule val benchmarkRule = BenchmarkRule()
- private lateinit var autofillTree: androidx.compose.ui.autofill.AutofillTree
+ private lateinit var autofillTree:
+ @Suppress("Deprecation")
+ androidx.compose.ui.autofill.AutofillTree
private lateinit var composeView: View
@Before
fun setup() {
composeTestRule.setContent {
- autofillTree = LocalAutofillTree.current
+ autofillTree = @Suppress("Deprecation") LocalAutofillTree.current
composeView = LocalView.current
}
}
@@ -59,6 +61,7 @@
composeTestRule.runOnUiThread {
// Arrange.
val autofillNode =
+ @Suppress("Deprecation")
androidx.compose.ui.autofill.AutofillNode(
onFill = {},
autofillTypes =
diff --git a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/autofill/ExplicitAutofillTypesDemo.kt b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/autofill/ExplicitAutofillTypesDemo.kt
index f9e568a..fdb8704c 100644
--- a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/autofill/ExplicitAutofillTypesDemo.kt
+++ b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/autofill/ExplicitAutofillTypesDemo.kt
@@ -30,7 +30,6 @@
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
-import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.layout.boundsInWindow
@@ -49,7 +48,11 @@
Column {
Autofill(
- autofillTypes = listOf(androidx.compose.ui.autofill.AutofillType.PersonFullName),
+ autofillTypes =
+ listOf(
+ @Suppress("Deprecation")
+ androidx.compose.ui.autofill.AutofillType.PersonFullName
+ ),
onFill = { name = TextFieldValue(it) }
) {
OutlinedTextField(
@@ -62,7 +65,10 @@
Spacer(Modifier.height(10.dp))
Autofill(
- autofillTypes = listOf(androidx.compose.ui.autofill.AutofillType.EmailAddress),
+ autofillTypes =
+ listOf(
+ @Suppress("Deprecation") androidx.compose.ui.autofill.AutofillType.EmailAddress
+ ),
onFill = { email = TextFieldValue(it) }
) {
OutlinedTextField(
@@ -76,14 +82,15 @@
@Composable
private fun Autofill(
- autofillTypes: List<androidx.compose.ui.autofill.AutofillType>,
+ autofillTypes: List<@Suppress("Deprecation") androidx.compose.ui.autofill.AutofillType>,
onFill: ((String) -> Unit),
content: @Composable BoxScope.() -> Unit
) {
- val autofill = @OptIn(ExperimentalComposeUiApi::class) LocalAutofill.current
- val autofillTree = LocalAutofillTree.current
+ val autofill = @Suppress("Deprecation") LocalAutofill.current
+ val autofillTree = @Suppress("Deprecation") LocalAutofillTree.current
val autofillNode =
remember(autofillTypes, onFill) {
+ @Suppress("Deprecation")
androidx.compose.ui.autofill.AutofillNode(
onFill = onFill,
autofillTypes = autofillTypes
diff --git a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/autofill/MixedOldNewAutofillDemo.kt b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/autofill/MixedOldNewAutofillDemo.kt
index fd19751..5c8044d 100644
--- a/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/autofill/MixedOldNewAutofillDemo.kt
+++ b/compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/autofill/MixedOldNewAutofillDemo.kt
@@ -32,7 +32,6 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.remember
-import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.autofill.ContentType
import androidx.compose.ui.focus.onFocusChanged
@@ -69,10 +68,11 @@
)
// Text field using old autofill API.
- val autofill = @OptIn(ExperimentalComposeUiApi::class) LocalAutofill.current
- val autofillTree = LocalAutofillTree.current
+ val autofill = @Suppress("DEPRECATION") LocalAutofill.current
+ val autofillTree = @Suppress("DEPRECATION") LocalAutofillTree.current
val textState = rememberTextFieldState()
val autofillNode = remember {
+ @Suppress("DEPRECATION")
androidx.compose.ui.autofill.AutofillNode(
onFill = { textState.edit { replace(0, length, it) } },
autofillTypes = listOf(androidx.compose.ui.autofill.AutofillType.Password),
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/autofill/AndroidAutoFillTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/autofill/AndroidAutoFillTest.kt
index b3bc836..a89f445 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/autofill/AndroidAutoFillTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/autofill/AndroidAutoFillTest.kt
@@ -44,16 +44,16 @@
class AndroidAutoFillTest {
@get:Rule val rule = createComposeRule()
- private var autofill: Autofill? = null
- private lateinit var autofillTree: AutofillTree
+ private var autofill: @Suppress("Deprecation") Autofill? = null
+ private lateinit var autofillTree: @Suppress("Deprecation") AutofillTree
private lateinit var ownerView: View
@Before
fun setup() {
rule.setContent {
ownerView = LocalView.current
- autofill = LocalAutofill.current
- autofillTree = LocalAutofillTree.current
+ autofill = @Suppress("Deprecation") LocalAutofill.current
+ autofillTree = @Suppress("Deprecation") LocalAutofillTree.current
}
}
@@ -81,6 +81,7 @@
// Arrange.
val viewStructure: ViewStructure = FakeViewStructure()
val autofillNode =
+ @Suppress("Deprecation")
AutofillNode(
onFill = {},
autofillTypes = listOf(AutofillType.PersonFullName),
@@ -123,6 +124,7 @@
val expectedValue = "PersonName"
var autoFilledValue = ""
val autofillNode =
+ @Suppress("Deprecation")
AutofillNode(
onFill = { autoFilledValue = it },
autofillTypes = listOf(AutofillType.PersonFullName),
diff --git a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/autofill/MixedAutofillTest.kt b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/autofill/MixedAutofillTest.kt
index a955f9d..2afa5ae 100644
--- a/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/autofill/MixedAutofillTest.kt
+++ b/compose/ui/ui/src/androidInstrumentedTest/kotlin/androidx/compose/ui/autofill/MixedAutofillTest.kt
@@ -65,9 +65,8 @@
@get:Rule val rule = createComposeRule()
private val height = 200.dp
private val width = 200.dp
-
- @OptIn(ExperimentalComposeUiApi::class)
- private val previousFlagValue = ComposeUiFlags.isSemanticAutofillEnabled
+ private val previousFlagValue =
+ @OptIn(ExperimentalComposeUiApi::class) ComposeUiFlags.isSemanticAutofillEnabled
@Before
fun enableAutofill() {
@@ -124,13 +123,14 @@
fun populateViewStructure_new_old_sameLayoutNode() {
// Arrange.
lateinit var view: View
- lateinit var autofillTree: AutofillTree
+ lateinit var autofillTree: @Suppress("DEPRECATION") AutofillTree
val viewStructure: ViewStructure = FakeViewStructure()
- lateinit var autofillNode: AutofillNode
+ lateinit var autofillNode: @Suppress("DEPRECATION") AutofillNode
rule.setContent {
view = LocalView.current
- autofillTree = LocalAutofillTree.current
+ autofillTree = @Suppress("DEPRECATION") LocalAutofillTree.current
autofillNode = remember {
+ @Suppress("DEPRECATION")
AutofillNode(
onFill = {},
autofillTypes = listOf(AutofillType.Password),
@@ -203,13 +203,14 @@
fun populateViewStructure_new_old_differentLayoutNodes() {
// Arrange.
lateinit var view: View
- lateinit var autofillTree: AutofillTree
+ lateinit var autofillTree: @Suppress("DEPRECATION") AutofillTree
val viewStructure: ViewStructure = FakeViewStructure()
- lateinit var autofillNode: AutofillNode
+ lateinit var autofillNode: @Suppress("DEPRECATION") AutofillNode
rule.setContent {
view = LocalView.current
- autofillTree = LocalAutofillTree.current
+ autofillTree = @Suppress("DEPRECATION") LocalAutofillTree.current
autofillNode = remember {
+ @Suppress("DEPRECATION")
AutofillNode(
onFill = {},
autofillTypes = listOf(AutofillType.Password),
@@ -288,14 +289,15 @@
fun autofill_new_old_sameLayoutNode() {
// Arrange.
lateinit var view: View
- lateinit var autofillTree: AutofillTree
- lateinit var autofillNode: AutofillNode
+ lateinit var autofillTree: @Suppress("DEPRECATION") AutofillTree
+ lateinit var autofillNode: @Suppress("DEPRECATION") AutofillNode
lateinit var autoFilledValueNewApi: String
lateinit var autoFilledValueOldApi: String
rule.setContent {
view = LocalView.current
- autofillTree = LocalAutofillTree.current
+ autofillTree = @Suppress("DEPRECATION") LocalAutofillTree.current
autofillNode = remember {
+ @Suppress("DEPRECATION")
AutofillNode(
onFill = { autoFilledValueOldApi = it },
autofillTypes = listOf(AutofillType.Password),
@@ -343,14 +345,15 @@
fun autofill_new_old_differentLayoutNodes() {
// Arrange.
lateinit var view: View
- lateinit var autofillTree: AutofillTree
- lateinit var autofillNode: AutofillNode
+ lateinit var autofillTree: @Suppress("DEPRECATION") AutofillTree
+ lateinit var autofillNode: @Suppress("DEPRECATION") AutofillNode
lateinit var autoFilledValueNewApi: String
lateinit var autoFilledValueOldApi: String
rule.setContent {
view = LocalView.current
- autofillTree = LocalAutofillTree.current
+ autofillTree = @Suppress("DEPRECATION") LocalAutofillTree.current
autofillNode = remember {
+ @Suppress("DEPRECATION")
AutofillNode(
onFill = { autoFilledValueOldApi = it },
autofillTypes = listOf(AutofillType.Password),
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/autofill/AndroidAutofill.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/autofill/AndroidAutofill.android.kt
index 680dcbd..4548793 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/autofill/AndroidAutofill.android.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/autofill/AndroidAutofill.android.kt
@@ -37,7 +37,10 @@
* @param autofillTree The autofill tree. This will be replaced by a semantic tree (b/138604305).
*/
@RequiresApi(Build.VERSION_CODES.O)
-internal class AndroidAutofill(val view: View, val autofillTree: AutofillTree) : Autofill {
+internal class AndroidAutofill(
+ val view: View,
+ val autofillTree: @Suppress("Deprecation") AutofillTree
+) : @Suppress("Deprecation") Autofill {
val autofillManager =
view.context.getSystemService(AutofillManager::class.java)
@@ -50,7 +53,7 @@
checkPreconditionNotNull(ViewCompatShims.getAutofillId(view)?.toAutofillId())
}
- override fun requestAutofillForNode(autofillNode: AutofillNode) {
+ override fun requestAutofillForNode(autofillNode: @Suppress("Deprecation") AutofillNode) {
val boundingBox =
autofillNode.boundingBox ?: error("requestAutofill called before onChildPositioned()")
@@ -69,7 +72,7 @@
)
}
- override fun cancelAutofillForNode(autofillNode: AutofillNode) {
+ override fun cancelAutofillForNode(autofillNode: @Suppress("Deprecation") AutofillNode) {
autofillManager.notifyViewExited(view, autofillNode.id)
}
}
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/autofill/AndroidAutofillType.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/autofill/AndroidAutofillType.android.kt
index cb92103..47e8a57 100644
--- a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/autofill/AndroidAutofillType.android.kt
+++ b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/autofill/AndroidAutofillType.android.kt
@@ -57,6 +57,7 @@
* Gets the Android specific [AutofillHint][android.view.ViewStructure.setAutofillHints]
* corresponding to the current [AutofillType].
*/
+@Suppress("Deprecation")
internal val AutofillType.androidType: String
get() {
val androidAutofillType = androidAutofillTypes[this]
@@ -65,6 +66,7 @@
}
/** Maps each [AutofillType] to one of the autofill hints in [androidx.autofill.HintConstants] */
+@Suppress("Deprecation")
private val androidAutofillTypes: HashMap<AutofillType, String> =
hashMapOf(
AutofillType.EmailAddress to AUTOFILL_HINT_EMAIL_ADDRESS,
diff --git a/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidAutofillTypeTest.kt b/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidAutofillTypeTest.kt
index b5c8886..bc1dca0 100644
--- a/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidAutofillTypeTest.kt
+++ b/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidAutofillTypeTest.kt
@@ -21,6 +21,7 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
+@Suppress("Deprecation")
@RunWith(JUnit4::class)
class AndroidAutofillTypeTest {
diff --git a/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidPerformAutofillTest.kt b/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidPerformAutofillTest.kt
index 126bfc9..3b25b9d 100644
--- a/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidPerformAutofillTest.kt
+++ b/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidPerformAutofillTest.kt
@@ -32,7 +32,7 @@
@RunWith(RobolectricTestRunner::class)
@Config(minSdk = 26)
class AndroidPerformAutofillTest {
- private val autofillTree = AutofillTree()
+ private val autofillTree = @Suppress("Deprecation") AutofillTree()
private lateinit var androidAutofill: AndroidAutofill
@Before
@@ -50,6 +50,7 @@
val expectedValue = "Name"
var autoFilledValue = ""
val autofillNode =
+ @Suppress("Deprecation")
AutofillNode(
onFill = { autoFilledValue = it },
autofillTypes = listOf(AutofillType.PersonFullName),
@@ -75,6 +76,7 @@
val expectedValue = "[email protected]"
var autoFilledValue = ""
val autofillNode =
+ @Suppress("Deprecation")
AutofillNode(
onFill = { autoFilledValue = it },
autofillTypes = listOf(AutofillType.EmailAddress),
diff --git a/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidPopulateViewStructureTest.kt b/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidPopulateViewStructureTest.kt
index af54aa9..bfba901 100644
--- a/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidPopulateViewStructureTest.kt
+++ b/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AndroidPopulateViewStructureTest.kt
@@ -32,7 +32,7 @@
@RunWith(RobolectricTestRunner::class)
@Config(manifest = Config.NONE, minSdk = 26)
class AndroidPopulateViewStructureTest {
- private val autofillTree = AutofillTree()
+ private val autofillTree = @Suppress("Deprecation") AutofillTree()
private lateinit var androidAutofill: AndroidAutofill
private lateinit var currentPackage: String
@@ -62,6 +62,7 @@
fun populateViewStructure_oneChild() {
// Arrange.
val autofillNode =
+ @Suppress("Deprecation")
AutofillNode(
onFill = {},
autofillTypes = listOf(AutofillType.PersonFullName),
@@ -94,6 +95,7 @@
fun populateViewStructure_twoChildren() {
// Arrange.
val nameAutofillNode =
+ @Suppress("Deprecation")
AutofillNode(
onFill = {},
autofillTypes = listOf(AutofillType.PersonFullName),
@@ -102,6 +104,7 @@
autofillTree += nameAutofillNode
val emailAutofillNode =
+ @Suppress("Deprecation")
AutofillNode(
onFill = {},
autofillTypes = listOf(AutofillType.EmailAddress),
diff --git a/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AutofillNodeTest.kt b/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AutofillNodeTest.kt
index debfc97..beef42e 100644
--- a/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AutofillNodeTest.kt
+++ b/compose/ui/ui/src/androidUnitTest/kotlin/androidx/compose/ui/autofill/AutofillNodeTest.kt
@@ -39,7 +39,7 @@
private lateinit var androidAutofill: AndroidAutofill
private lateinit var autofillManager: ShadowAutofillManager
private lateinit var view: View
- private val autofillTree = AutofillTree()
+ private val autofillTree = @Suppress("Deprecation") AutofillTree()
@Before
fun setup() {
@@ -57,6 +57,7 @@
@Test
fun eachInstanceHasUniqueId() {
+ @Suppress("Deprecation")
assertThat(listOf(AutofillNode {}.id, AutofillNode {}.id, AutofillNode {}.id))
.containsNoDuplicates()
}
@@ -70,7 +71,7 @@
fun requestAutofillForNode_calls_notifyViewEntered() {
// Arrange.
val bounds = Rect(0f, 0f, 0f, 0f)
- val autofillNode = AutofillNode(onFill = {}, boundingBox = bounds)
+ val autofillNode = @Suppress("Deprecation") AutofillNode(onFill = {}, boundingBox = bounds)
// Act.
androidAutofill.requestAutofillForNode(autofillNode)
@@ -83,7 +84,7 @@
@Test
fun requestAutofillForNode_beforeComposableIsPositioned_throwsError() {
// Arrange - Before the composable is positioned, the boundingBox is null.
- val autofillNode = AutofillNode(onFill = {})
+ val autofillNode = @Suppress("Deprecation") AutofillNode(onFill = {})
// Act and assert.
val exception =
@@ -100,7 +101,7 @@
@Test
fun cancelAutofillForNode_calls_notifyViewExited() {
// Arrange.
- val autofillNode = AutofillNode(onFill = {})
+ val autofillNode = @Suppress("Deprecation") AutofillNode(onFill = {})
// Act.
androidAutofill.cancelAutofillForNode(autofillNode)
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/Autofill.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/Autofill.kt
index bc0ac620..fd42810 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/Autofill.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/Autofill.kt
@@ -30,6 +30,14 @@
* request or cancel autofill as required. For instance, the TextField can call
* [requestAutofillForNode] when it gains focus, and [cancelAutofillForNode] when it loses focus.
*/
+@Deprecated(
+ """
+ You no longer have to call these apis when focus changes. They will be called
+ automatically when you Use the new semantics based APIs for autofill. Use the
+ androidx.compose.ui.autofill.ContentType and androidx.compose.ui.autofill.ContentDataType
+ semantics properties instead.
+ """
+)
interface Autofill {
/**
@@ -37,22 +45,22 @@
*
* @param autofillNode The node that needs to be auto-filled.
*
- * This function is usually called when an autofillable component gains focus.
+ * This function is usually called when an autofill-able component gains focus.
*/
- fun requestAutofillForNode(autofillNode: AutofillNode)
+ fun requestAutofillForNode(autofillNode: @Suppress("Deprecation") AutofillNode)
/**
* Cancel a previously supplied autofill request.
*
* @param autofillNode The node that needs to be auto-filled.
*
- * This function is usually called when an autofillable component loses focus.
+ * This function is usually called when an autofill-able component loses focus.
*/
- fun cancelAutofillForNode(autofillNode: AutofillNode)
+ fun cancelAutofillForNode(autofillNode: @Suppress("Deprecation") AutofillNode)
}
/**
- * Every autofillable composable will have an [AutofillNode]. (An autofill node will be created for
+ * Every autofill-able composable will have an [AutofillNode]. (An autofill node will be created for
* every semantics node that adds autofill properties). This node is used to request/cancel
* autofill, and it holds the [onFill] lambda which is called by the autofill framework.
*
@@ -67,8 +75,14 @@
* @property onFill The callback that is called by the autofill framework to perform autofill.
* @property id A virtual id that is automatically generated for each node.
*/
+@Deprecated(
+ """
+ Use the new semantics-based Autofill APIs androidx.compose.ui.autofill.ContentType and
+ androidx.compose.ui.autofill.ContentDataType instead.
+ """
+)
class AutofillNode(
- val autofillTypes: List<AutofillType> = listOf(),
+ val autofillTypes: List<@Suppress("Deprecation") AutofillType> = listOf(),
var boundingBox: Rect? = null,
val onFill: ((String) -> Unit)?
) {
@@ -87,7 +101,7 @@
override fun equals(other: Any?): Boolean {
if (this === other) return true
- if (other !is AutofillNode) return false
+ if (other !is @Suppress("Deprecation") AutofillNode) return false
if (autofillTypes != other.autofillTypes) return false
if (boundingBox != other.boundingBox) return false
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillManager.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillManager.kt
index f5ebdc7..a57c432 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillManager.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillManager.kt
@@ -39,7 +39,7 @@
*
* Call this function to notify the Autofill framework that the current session should be
* canceled. After calling this function, the framework will stop the current autofill session
- * without processing any information entered in the autofillable field.
+ * without processing any information entered in the autofill-able field.
*/
abstract fun cancel()
}
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillTree.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillTree.kt
index ead55c5..5ed237c 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillTree.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillTree.kt
@@ -27,12 +27,18 @@
* Since this is a temporary implementation, it is implemented as a list of [children], which is
* essentially a tree of height = 1
*/
+@Deprecated(
+ """
+ Use the new semantics-based Autofill APIs androidx.compose.ui.autofill.ContentType and
+ androidx.compose.ui.autofill.ContentDataType instead.
+ """
+)
class AutofillTree {
- /** A map which contains [AutofillNode]s, where every node represents an autofillable field. */
- val children: MutableMap<Int, AutofillNode> = mutableMapOf()
+ /** A map which contains [AutofillNode]s, where every node represents an autofill-able field. */
+ val children: MutableMap<Int, @Suppress("Deprecation") AutofillNode> = mutableMapOf()
/** Add the specified [AutofillNode] to the [AutofillTree]. */
- operator fun plusAssign(autofillNode: AutofillNode) {
+ operator fun plusAssign(autofillNode: @Suppress("Deprecation") AutofillNode) {
children[autofillNode.id] = autofillNode
}
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillType.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillType.kt
index 8449d95..957ec86 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillType.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/autofill/AutofillType.kt
@@ -24,7 +24,11 @@
* Autofill services use the [AutofillType] to determine what value to use to autofill fields
* associated with this type. If the [AutofillType] is not specified, the autofill services have to
* use heuristics to determine the right value to use while auto-filling the corresponding field.
+ *
+ * This has been deprecated in favor of a new semantics based API. Use
+ * [ContentType][androidx.compose.ui.semantics.SemanticsProperties.ContentType] instead.
*/
+@Deprecated("Use the new semantics-based API and androidx.compose.ui.autofill.ContentType instead.")
enum class AutofillType {
/** Indicates that the associated component can be auto-filled with an email address. */
EmailAddress,
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/Owner.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/Owner.kt
index ee7342a..7e031fd 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/Owner.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/node/Owner.kt
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@file:Suppress("DEPRECATION")
package androidx.compose.ui.node
@@ -21,9 +20,7 @@
import androidx.collection.IntObjectMap
import androidx.compose.runtime.Applier
import androidx.compose.ui.InternalComposeUiApi
-import androidx.compose.ui.autofill.Autofill
import androidx.compose.ui.autofill.AutofillManager
-import androidx.compose.ui.autofill.AutofillTree
import androidx.compose.ui.draganddrop.DragAndDropManager
import androidx.compose.ui.focus.FocusDirection
import androidx.compose.ui.focus.FocusOwner
@@ -41,7 +38,6 @@
import androidx.compose.ui.modifier.ModifierLocalManager
import androidx.compose.ui.platform.AccessibilityManager
import androidx.compose.ui.platform.Clipboard
-import androidx.compose.ui.platform.ClipboardManager
import androidx.compose.ui.platform.PlatformTextInputModifierNode
import androidx.compose.ui.platform.PlatformTextInputSessionScope
import androidx.compose.ui.platform.SoftwareKeyboardController
@@ -52,7 +48,6 @@
import androidx.compose.ui.spatial.RectManager
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.input.TextInputService
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.LayoutDirection
@@ -88,7 +83,7 @@
val inputModeManager: InputModeManager
/** Provide clipboard manager to the user. Use the Android version of clipboard manager. */
- val clipboardManager: ClipboardManager
+ val clipboardManager: @Suppress("Deprecation") androidx.compose.ui.platform.ClipboardManager
/**
* Provide clipboard manager with suspend function to the user. Use the Android version of
@@ -114,17 +109,14 @@
/**
* A data structure used to store autofill information. It is used by components that want to
* provide autofill semantics.
- *
- * TODO(ralu): Replace with SemanticsTree. This is a temporary hack until we have a semantics
- * tree implemented.
*/
- val autofillTree: AutofillTree
+ val autofillTree: @Suppress("Deprecation") androidx.compose.ui.autofill.AutofillTree
/**
- * The [Autofill] class can be used to perform autofill operations. It is used as a
- * CompositionLocal.
+ * The [Autofill][androidx.compose.ui.autofill.Autofill] class can be used to perform autofill
+ * operations. It is used as a CompositionLocal.
*/
- val autofill: Autofill?
+ val autofill: @Suppress("Deprecation") androidx.compose.ui.autofill.Autofill?
/**
* The [AutofillManager] class can be used to perform autofill operations. It is used as a
@@ -134,7 +126,7 @@
val density: Density
- val textInputService: TextInputService
+ val textInputService: @Suppress("Deprecation") androidx.compose.ui.text.input.TextInputService
val softwareKeyboardController: SoftwareKeyboardController
diff --git a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/CompositionLocals.kt b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/CompositionLocals.kt
index f4fa22c..421ffde 100644
--- a/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/CompositionLocals.kt
+++ b/compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/CompositionLocals.kt
@@ -52,9 +52,12 @@
* The CompositionLocal that can be used to trigger autofill actions. Eg.
* [Autofill.requestAutofillForNode].
*/
-@Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
-@get:ExperimentalComposeUiApi
-@ExperimentalComposeUiApi
+@Deprecated(
+ """
+ Use the new semantics-based Autofill APIs androidx.compose.ui.autofill.ContentType and
+ androidx.compose.ui.autofill.ContentDataType instead.
+ """
+)
val LocalAutofill = staticCompositionLocalOf<Autofill?> { null }
/**
@@ -62,14 +65,18 @@
* androidx.compose.ui.autofill.AutofillNode]s to the autofill tree. The [AutofillTree] is a
* temporary data structure that will be replaced by Autofill Semantics (b/138604305).
*/
-@Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
+@Deprecated(
+ """
+ Use the new semantics-based Autofill APIs androidx.compose.ui.autofill.ContentType and
+ androidx.compose.ui.autofill.ContentDataType instead.
+ """
+)
val LocalAutofillTree =
staticCompositionLocalOf<AutofillTree> { noLocalProvidedFor("LocalAutofillTree") }
/**
* The CompositionLocal that can be used to trigger autofill actions. Eg. [AutofillManager.commit].
*/
-@Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
val LocalAutofillManager =
staticCompositionLocalOf<AutofillManager?> { noLocalProvidedFor("LocalAutofillManager") }
