diff --git a/api/current.txt b/api/current.txt index 529f2918f94ff..e1a36085fe11c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -52637,12 +52637,12 @@ package android.view.contentcapture { method @NonNull public final android.view.contentcapture.ContentCaptureSession createContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext); method public final void destroy(); method public final android.view.contentcapture.ContentCaptureSessionId getContentCaptureSessionId(); - method @NonNull public android.view.autofill.AutofillId newAutofillId(@NonNull android.view.autofill.AutofillId, int); - method @NonNull public final android.view.ViewStructure newVirtualViewStructure(@NonNull android.view.autofill.AutofillId, int); + method @NonNull public android.view.autofill.AutofillId newAutofillId(@NonNull android.view.autofill.AutofillId, long); + method @NonNull public final android.view.ViewStructure newVirtualViewStructure(@NonNull android.view.autofill.AutofillId, long); method public final void notifyViewAppeared(@NonNull android.view.ViewStructure); method public final void notifyViewDisappeared(@NonNull android.view.autofill.AutofillId); method public final void notifyViewTextChanged(@NonNull android.view.autofill.AutofillId, @Nullable CharSequence, int); - method public final void notifyViewsDisappeared(@NonNull android.view.autofill.AutofillId, @NonNull int[]); + method public final void notifyViewsDisappeared(@NonNull android.view.autofill.AutofillId, @NonNull long[]); } public final class ContentCaptureSessionId implements android.os.Parcelable { diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 1063be4c5c7db..92f47e767d2e4 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -8218,10 +8218,10 @@ public class Activity extends ContextThemeWrapper final AutofillId autofillId = autofillIds[i]; final View view = autofillClientFindViewByAutofillIdTraversal(autofillId); if (view != null) { - if (!autofillId.isVirtual()) { + if (!autofillId.isVirtualInt()) { visible[i] = view.isVisibleToUser(); } else { - visible[i] = view.isVisibleToUserForAutofill(autofillId.getVirtualChildId()); + visible[i] = view.isVisibleToUserForAutofill(autofillId.getVirtualChildIntId()); } } } diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java index 7d03f00611d4d..6006ad2f5ed3b 100644 --- a/core/java/android/app/assist/AssistStructure.java +++ b/core/java/android/app/assist/AssistStructure.java @@ -894,7 +894,7 @@ public class AssistStructure implements Parcelable { } if (mAutofillId != null) { autofillFlags |= AUTOFILL_FLAGS_HAS_AUTOFILL_VIEW_ID; - if (mAutofillId.isVirtual()) { + if (mAutofillId.isVirtualInt()) { autofillFlags |= AUTOFILL_FLAGS_HAS_AUTOFILL_VIRTUAL_VIEW_ID; } } @@ -961,8 +961,9 @@ public class AssistStructure implements Parcelable { if ((autofillFlags & AUTOFILL_FLAGS_HAS_AUTOFILL_VIEW_ID) != 0) { out.writeInt(mAutofillId.getViewId()); if ((autofillFlags & AUTOFILL_FLAGS_HAS_AUTOFILL_VIRTUAL_VIEW_ID) != 0) { - out.writeInt(mAutofillId.getVirtualChildId()); + out.writeInt(mAutofillId.getVirtualChildIntId()); } + // TODO(b/113593220): write session id as well } if ((autofillFlags & AUTOFILL_FLAGS_HAS_AUTOFILL_TYPE) != 0) { out.writeInt(mAutofillType); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 2014ec2417ac5..9d0c9f42697f8 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -8203,10 +8203,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * {@link ContentCaptureSession#notifyViewDisappeared(AutofillId)}, and * {@link ContentCaptureSession#notifyViewTextChanged(AutofillId, CharSequence, int)} * respectively. The structure for the a child must be created using - * {@link ContentCaptureSession#newVirtualViewStructure(AutofillId, int)}, and the + * {@link ContentCaptureSession#newVirtualViewStructure(AutofillId, long)}, and the * {@code autofillId} for a child can be obtained either through * {@code childStructure.getAutofillId()} or - * {@link ContentCaptureSession#newAutofillId(AutofillId, int)}. + * {@link ContentCaptureSession#newAutofillId(AutofillId, long)}. * *

Note: the following methods of the {@code structure} will be ignored: *