diff options
Diffstat (limited to 'core/java/android')
4 files changed, 8 insertions, 10 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index a17a188071ec..519181d364c2 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -8210,7 +8210,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * changed by calling * {@link ContentCaptureSession#notifyViewAppeared(ViewStructure)}, * {@link ContentCaptureSession#notifyViewDisappeared(AutofillId)}, and - * {@link ContentCaptureSession#notifyViewTextChanged(AutofillId, CharSequence, int)} + * {@link ContentCaptureSession#notifyViewTextChanged(AutofillId, CharSequence)} * respectively. The structure for the a child must be created using * {@link ContentCaptureSession#newVirtualViewStructure(AutofillId, long)}, and the * {@code autofillId} for a child can be obtained either through diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java index e6ee6ed6c55f..68a3e8a1eb32 100644 --- a/core/java/android/view/contentcapture/ContentCaptureSession.java +++ b/core/java/android/view/contentcapture/ContentCaptureSession.java @@ -54,7 +54,7 @@ public abstract class ContentCaptureSession implements AutoCloseable { * @hide */ // NOTE: not prefixed by STATE_ so it's not printed on getStateAsString() - public static final int UNKNWON_STATE = 0x0; + public static final int UNKNOWN_STATE = 0x0; /** * Service's startSession() was called, but server didn't confirm it was created yet. @@ -160,7 +160,7 @@ public abstract class ContentCaptureSession implements AutoCloseable { @Nullable protected final String mId; - private int mState = UNKNWON_STATE; + private int mState = UNKNOWN_STATE; // Lazily created on demand. private ContentCaptureSessionId mContentCaptureSessionId; @@ -350,10 +350,8 @@ public abstract class ContentCaptureSession implements AutoCloseable { * * @param id of the node. * @param text new text. - * @param flags currently ignored. */ - public final void notifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text, - int flags) { + public final void notifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text) { Preconditions.checkNotNull(id); if (!isContentCaptureEnabled()) return; @@ -439,7 +437,7 @@ public abstract class ContentCaptureSession implements AutoCloseable { /** @hide */ @NonNull protected static String getStateAsString(int state) { - return state + " (" + (state == UNKNWON_STATE ? "UNKNOWN" + return state + " (" + (state == UNKNOWN_STATE ? "UNKNOWN" : DebugUtils.flagsToString(ContentCaptureSession.class, "STATE_", state)) + ")"; } diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java index 72aefb20f2cb..2eca51f61e91 100644 --- a/core/java/android/view/contentcapture/MainContentCaptureSession.java +++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java @@ -115,7 +115,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { @Nullable private DeathRecipient mDirectServiceVulture; - private int mState = UNKNWON_STATE; + private int mState = UNKNOWN_STATE; @Nullable private IBinder mApplicationToken; @@ -367,7 +367,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { } private boolean handleHasStarted() { - return mState != UNKNWON_STATE; + return mState != UNKNOWN_STATE; } private void handleScheduleFlush(@FlushReason int reason, boolean checkExisting) { diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 780fe8d821d6..2b45c0697155 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -10275,7 +10275,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener final ContentCaptureSession session = getContentCaptureSession(); if (session != null) { // TODO(b/111276913): pass flags when edited by user / add CTS test - session.notifyViewTextChanged(getAutofillId(), getText(), /* flags= */ 0); + session.notifyViewTextChanged(getAutofillId(), getText()); } } } |