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

Merge "Hide augmented inline suggestion if field value is changed to not empty" into rvc-dev am: 74548402d1

Browse Source 
Change-Id: I550277e52370bf4606023091d34d9e9128801ae1
This commit is contained in:
TreeHugger Robot
2020-04-16 00:40:57 +00:00
committed by Automerger Merge Worker
parent b21ebd20f3 74548402d1
commit 559d7fc446
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/autofill/AutofillManager.java
View File

@@ -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 (!mEnabled || !isActiveLocked()) {
if (!startAutofillIfNeededLocked(view)) { if (!startAutofillIfNeededLocked(view)) {
if (sVerbose) { if (sVerbose) {
@@ -1299,10 +1292,6 @@ public final class AutofillManager {
return; return;
} }
synchronized (mLock) { synchronized (mLock) {
if (mForAugmentedAutofillOnly) {
if (sVerbose) Log.v(TAG, "notifyValueChanged(): ignoring on augmented only mode");
return;
}
if (!mEnabled || !isActiveLocked()) { if (!mEnabled || !isActiveLocked()) {
if (sVerbose) { if (sVerbose) {
Log.v(TAG, "notifyValueChanged(" + view.getAutofillId() + ":" + virtualId Log.v(TAG, "notifyValueChanged(" + view.getAutofillId() + ":" + virtualId

5
services/autofill/java/com/android/server/autofill/Session.java
View File

@@ -2653,6 +2653,11 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
} else if (viewState.id.equals(this.mCurrentViewId) } else if (viewState.id.equals(this.mCurrentViewId)
&& (viewState.getState() & ViewState.STATE_INLINE_SHOWN) != 0) { && (viewState.getState() & ViewState.STATE_INLINE_SHOWN) != 0) {
requestShowInlineSuggestionsLocked(viewState.getResponse(), filterText); 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); viewState.setState(ViewState.STATE_CHANGED);