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

Merge "Add call to send empty suggestions to IME on cancelling augmented autofill." into rvc-dev

Browse Source
This commit is contained in:
Adam He
2020-06-22 20:34:55 +00:00
committed by Android (Google) Code Review
parent f27737a29d c71f42e751
commit 2359a78aaa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2979,8 +2979,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
inlineSuggestionsRequest.get(), response, focusedId, filterText, inlineSuggestionsRequest.get(), response, focusedId, filterText,
/*uiCallback*/this, /*onErrorCallback*/ () -> { /*uiCallback*/this, /*onErrorCallback*/ () -> {
synchronized (mLock) { synchronized (mLock) {
mInlineSessionController.hideInlineSuggestionsUiLocked( mInlineSessionController.setInlineFillUiLocked(
focusedId); InlineFillUi.emptyUi(focusedId));
} }
}, remoteRenderService); }, remoteRenderService);
return mInlineSessionController.setInlineFillUiLocked(inlineFillUi); return mInlineSessionController.setInlineFillUiLocked(inlineFillUi);
@@ -3284,6 +3284,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
/*onErrorCallback=*/ () -> { /*onErrorCallback=*/ () -> {
synchronized (mLock) { synchronized (mLock) {
cancelAugmentedAutofillLocked(); cancelAugmentedAutofillLocked();
// Also cancel augmented in IME
mInlineSessionController.setInlineFillUiLocked(
InlineFillUi.emptyUi(mCurrentViewId));
} }
}, mService.getRemoteInlineSuggestionRenderServiceLocked()); }, mService.getRemoteInlineSuggestionRenderServiceLocked());
} }