Removed ContentCaptureSession.FLAG_USER_INPUT.
This flag was meant to indicate when a text was changed by the user (for example, using IME), but
that information is not readly available and would require changes in too many parts of the system,
so it's not worth the effort (at least for now...).
Test: m update-api
Test: atest CtsContentCaptureServiceTestCases \
FrameworksCoreTests:android.view.contentcapture.ContentCaptureSessionTest
Fixes: 121045053
Change-Id: Ifcdd5e5bb0c6c5c0f840fe0bbdbda8eca9bdb479
diff --git a/api/current.txt b/api/current.txt
index 02d703f..0e220ca 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -52681,7 +52681,6 @@
method public final void notifyViewDisappeared(android.view.autofill.AutofillId);
method public final void notifyViewTextChanged(android.view.autofill.AutofillId, java.lang.CharSequence, int);
method public final void notifyViewsDisappeared(android.view.autofill.AutofillId, int[]);
- field public static final int FLAG_USER_INPUT = 1; // 0x1
}
public final class ContentCaptureSessionId implements android.os.Parcelable {
diff --git a/api/system-current.txt b/api/system-current.txt
index 15d0941..737922d 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8311,7 +8311,6 @@
public final class ContentCaptureEvent implements android.os.Parcelable {
method public int describeContents();
method public long getEventTime();
- method public int getFlags();
method public android.view.autofill.AutofillId getId();
method public java.lang.CharSequence getText();
method public int getType();
diff --git a/core/java/android/view/contentcapture/ChildContentCaptureSession.java b/core/java/android/view/contentcapture/ChildContentCaptureSession.java
index 0b39c3a..63c21f3 100644
--- a/core/java/android/view/contentcapture/ChildContentCaptureSession.java
+++ b/core/java/android/view/contentcapture/ChildContentCaptureSession.java
@@ -88,9 +88,8 @@
}
@Override
- void internalNotifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text,
- int flags) {
- getMainCaptureSession().notifyViewTextChanged(mId, id, text, flags);
+ void internalNotifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text) {
+ getMainCaptureSession().notifyViewTextChanged(mId, id, text);
}
@Override
diff --git a/core/java/android/view/contentcapture/ContentCaptureEvent.java b/core/java/android/view/contentcapture/ContentCaptureEvent.java
index 0d06430..fda7be0 100644
--- a/core/java/android/view/contentcapture/ContentCaptureEvent.java
+++ b/core/java/android/view/contentcapture/ContentCaptureEvent.java
@@ -74,7 +74,6 @@
private final @NonNull String mSessionId;
private final int mType;
private final long mEventTime;
- private final int mFlags;
private @Nullable AutofillId mId;
private @Nullable ViewNode mNode;
private @Nullable CharSequence mText;
@@ -82,21 +81,15 @@
private @Nullable ContentCaptureContext mClientContext;
/** @hide */
- public ContentCaptureEvent(@NonNull String sessionId, int type, long eventTime, int flags) {
+ public ContentCaptureEvent(@NonNull String sessionId, int type, long eventTime) {
mSessionId = sessionId;
mType = type;
mEventTime = eventTime;
- mFlags = flags;
- }
-
- /** @hide */
- public ContentCaptureEvent(@NonNull String sessionId, int type, int flags) {
- this(sessionId, type, System.currentTimeMillis(), flags);
}
/** @hide */
public ContentCaptureEvent(@NonNull String sessionId, int type) {
- this(sessionId, type, /* flags= */ 0);
+ this(sessionId, type, System.currentTimeMillis());
}
/** @hide */
@@ -183,16 +176,6 @@
}
/**
- * Gets optional flags associated with the event.
- *
- * @return either {@code 0} or
- * {@link android.view.contentcapture.ContentCaptureSession#FLAG_USER_INPUT}.
- */
- public int getFlags() {
- return mFlags;
- }
-
- /**
* Gets the whole metadata of the node associated with the event.
*
* <p>Only set on {@link #TYPE_VIEW_APPEARED} events.
@@ -226,9 +209,6 @@
public void dump(@NonNull PrintWriter pw) {
pw.print("type="); pw.print(getTypeAsString(mType));
pw.print(", time="); pw.print(mEventTime);
- if (mFlags > 0) {
- pw.print(", flags="); pw.print(mFlags);
- }
if (mId != null) {
pw.print(", id="); pw.print(mId);
}
@@ -255,9 +235,6 @@
if (mType == TYPE_SESSION_STARTED && mParentSessionId != null) {
string.append(", parent=").append(mParentSessionId);
}
- if (mFlags > 0) {
- string.append(", flags=").append(mFlags);
- }
if (mId != null) {
string.append(", id=").append(mId);
}
@@ -281,7 +258,6 @@
parcel.writeString(mSessionId);
parcel.writeInt(mType);
parcel.writeLong(mEventTime);
- parcel.writeInt(mFlags);
parcel.writeParcelable(mId, flags);
ViewNode.writeToParcel(parcel, mNode, flags);
parcel.writeCharSequence(mText);
@@ -301,9 +277,7 @@
final String sessionId = parcel.readString();
final int type = parcel.readInt();
final long eventTime = parcel.readLong();
- final int flags = parcel.readInt();
- final ContentCaptureEvent event =
- new ContentCaptureEvent(sessionId, type, eventTime, flags);
+ final ContentCaptureEvent event = new ContentCaptureEvent(sessionId, type, eventTime);
final AutofillId id = parcel.readParcelable(null);
if (id != null) {
event.setAutofillId(id);
diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java
index 7fb1fdd..a911737 100644
--- a/core/java/android/view/contentcapture/ContentCaptureSession.java
+++ b/core/java/android/view/contentcapture/ContentCaptureSession.java
@@ -51,12 +51,6 @@
private static final String TAG = ContentCaptureSession.class.getSimpleName();
/**
- * Used on {@link #notifyViewTextChanged(AutofillId, CharSequence, int)} to indicate that the
- * text change was caused by user input (for example, through IME).
- */
- public static final int FLAG_USER_INPUT = 0x1;
-
- /**
* Initial state, when there is no session.
*
* @hide
@@ -375,8 +369,7 @@
*
* @param id of the node.
* @param text new text.
- * @param flags either {@code 0} or {@link #FLAG_USER_INPUT} when the value was explicitly
- * changed by the user (for example, through the keyboard).
+ * @param flags currently ignored.
*/
public final void notifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text,
int flags) {
@@ -384,11 +377,11 @@
if (!isContentCaptureEnabled()) return;
- internalNotifyViewTextChanged(id, text, flags);
+ internalNotifyViewTextChanged(id, text);
}
- abstract void internalNotifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text,
- int flags);
+ abstract void internalNotifyViewTextChanged(@NonNull AutofillId id,
+ @Nullable CharSequence text);
/**
* Creates a {@link ViewStructure} for a "standard" view.
diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java
index f0778fa..773bcad 100644
--- a/core/java/android/view/contentcapture/MainContentCaptureSession.java
+++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java
@@ -473,9 +473,8 @@
}
@Override
- void internalNotifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text,
- int flags) {
- notifyViewTextChanged(mId, id, text, flags);
+ void internalNotifyViewTextChanged(@NonNull AutofillId id, @Nullable CharSequence text) {
+ notifyViewTextChanged(mId, id, text);
}
@Override
@@ -516,9 +515,9 @@
}
void notifyViewTextChanged(@NonNull String sessionId, @NonNull AutofillId id,
- @Nullable CharSequence text, int flags) {
+ @Nullable CharSequence text) {
mHandler.sendMessage(obtainMessage(MainContentCaptureSession::handleSendEvent, this,
- new ContentCaptureEvent(sessionId, TYPE_VIEW_TEXT_CHANGED, flags).setAutofillId(id)
+ new ContentCaptureEvent(sessionId, TYPE_VIEW_TEXT_CHANGED).setAutofillId(id)
.setText(text), /* forceFlush= */ false));
}
diff --git a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java
index 05c0df7..ff97aa1 100644
--- a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java
+++ b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureSessionTest.java
@@ -151,7 +151,7 @@
}
@Override
- void internalNotifyViewTextChanged(AutofillId id, CharSequence text, int flags) {
+ void internalNotifyViewTextChanged(AutofillId id, CharSequence text) {
throw new UnsupportedOperationException("should not have been called");
}
}