Merge "Hide augmented inline suggestion if field value is changed to not... (4c281843) · Commits · e / os / android_frameworks_base

core/java/android/view/autofill/AutofillManager.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -1258,13 +1258,6 @@ public final class AutofillManager {
		}
		}

		if (mForAugmentedAutofillOnly) {
		if (sVerbose) {
		Log.v(TAG, "notifyValueChanged(): not notifying system server on "
		+ "augmented-only mode");
		}
		return;
		}
		if (!mEnabled \|\| !isActiveLocked()) {
		if (!startAutofillIfNeededLocked(view)) {
		if (sVerbose) {
		@@ -1299,10 +1292,6 @@ public final class AutofillManager {
		return;
		}
		synchronized (mLock) {
		if (mForAugmentedAutofillOnly) {
		if (sVerbose) Log.v(TAG, "notifyValueChanged(): ignoring on augmented only mode");
		return;
		}
		if (!mEnabled \|\| !isActiveLocked()) {
		if (sVerbose) {
		Log.v(TAG, "notifyValueChanged(" + view.getAutofillId() + ":" + virtualId

+5 −0

Original line number	Diff line number	Diff line
		@@ -2653,6 +2653,11 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
		} else if (viewState.id.equals(this.mCurrentViewId)
		&& (viewState.getState() & ViewState.STATE_INLINE_SHOWN) != 0) {
		requestShowInlineSuggestionsLocked(viewState.getResponse(), filterText);
		} else if (viewState.id.equals(this.mCurrentViewId)
		&& (viewState.getState() & ViewState.STATE_TRIGGERED_AUGMENTED_AUTOFILL) != 0) {
		if (!TextUtils.isEmpty(filterText)) {
		mInlineSessionController.hideInlineSuggestionsUiLocked(mCurrentViewId);
		}
		}

		viewState.setState(ViewState.STATE_CHANGED);