Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removed unused flag from notifyTextChanged()."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-30 05:40:33 +00:00
committed by Android (Google) Code Review
parent 2040dcffa3 35ea763042
commit fdf4384585
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/View.java
View File

@@ -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

10
core/java/android/view/contentcapture/ContentCaptureSession.java
View File

@@ -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)) + ")";
}

4
core/java/android/view/contentcapture/MainContentCaptureSession.java
View File

@@ -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) {

2
core/java/android/widget/TextView.java
View File

@@ -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());
}
}
}