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

Merge "Hide suggestions with hideFillUi"

Browse Source
This commit is contained in:
Adam He
2020-02-21 01:26:05 +00:00
committed by Android (Google) Code Review
parent 72b5e4a8aa 217649d3ed
commit b909557790
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1158,6 +1158,18 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
} catch (RemoteException e) {
Slog.e(TAG, "Error requesting to hide fill UI", e);
}
try {
final InlineSuggestionSession.ImeResponse imeResponse =
mInlineSuggestionSession.waitAndGetImeResponse();
if (imeResponse == null) {
Log.w(TAG, "Session input method callback is not set yet");
return;
}
imeResponse.getCallback().onInlineSuggestionsResponse(
new InlineSuggestionsResponse(Collections.EMPTY_LIST));
} catch (RemoteException e) {
Slog.e(TAG, "RemoteException hiding inline suggestions");
}
}
}

15
services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java
View File

@@ -82,12 +82,17 @@ public final class InlineSuggestionFactory {
if (sDebug) Slog.d(TAG, "createInlineSuggestionsResponse called");
final BiConsumer<Dataset, Integer> onClickFactory;
if (response.getAuthentication() != null) {
onClickFactory = (dataset, datasetIndex) -> client.authenticate(response.getRequestId(),
datasetIndex, response.getAuthentication(), response.getClientState(),
/* authenticateInline= */ true);
onClickFactory = (dataset, datasetIndex) -> {
client.requestHideFillUi(autofillId);
client.authenticate(response.getRequestId(),
datasetIndex, response.getAuthentication(), response.getClientState(),
/* authenticateInline= */ true);
};
} else {
onClickFactory = (dataset, datasetIndex) ->
client.fill(response.getRequestId(), datasetIndex, dataset);
onClickFactory = (dataset, datasetIndex) -> {
client.requestHideFillUi(autofillId);
client.fill(response.getRequestId(), datasetIndex, dataset);
};
}
final List<Dataset> datasetList = response.getDatasets();