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 am: 2359a78aaa am: 159beba851 am: 41abc669e2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931369

Change-Id: Ife6b9a46d2a5db09360d301256b074756f0a30c9
This commit is contained in:
Adam He
2020-06-22 20:50:34 +00:00
committed by Automerger Merge Worker
parent 8ba8e935c7 41abc669e2
commit 87923aa8ab
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,
/*uiCallback*/this, /*onErrorCallback*/ () -> {
synchronized (mLock) {
mInlineSessionController.hideInlineSuggestionsUiLocked(
focusedId);
mInlineSessionController.setInlineFillUiLocked(
InlineFillUi.emptyUi(focusedId));
}
}, remoteRenderService);
return mInlineSessionController.setInlineFillUiLocked(inlineFillUi);
@@ -3284,6 +3284,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
/*onErrorCallback=*/ () -> {
synchronized (mLock) {
cancelAugmentedAutofillLocked();
// Also cancel augmented in IME
mInlineSessionController.setInlineFillUiLocked(
InlineFillUi.emptyUi(mCurrentViewId));
}
}, mService.getRemoteInlineSuggestionRenderServiceLocked());
}