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

Merge "Send inline actions to IME even when inline suggestions are empty" into rvc-dev am: 1ebbec569e am: f32b75885f am: e91b2954c5

Browse Source 
Change-Id: I3af60ebe76a917b0760ba3985d7b5fe9d189c6b5
This commit is contained in:
Automerger Merge Worker
2020-03-10 22:44:48 +00:00
parent 6648c62a3b e91b2954c5
commit 9f065f692f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2681,7 +2681,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
response, filterText, response.getInlineActions(), mCurrentViewId,
this, () -> {
synchronized (mLock) {
requestHideFillUi(mCurrentViewId);
mInlineSuggestionSession.hideInlineSuggestionsUi(mCurrentViewId);
}
}, remoteRenderService);
if (inlineSuggestionsResponse == null) {

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

@@ -167,8 +167,7 @@ public final class InlineSuggestionFactory {
inlineSuggestions.add(inlineSuggestion);
}
// We should only add inline actions if there is at least one suggestion.
if (!inlineSuggestions.isEmpty() && inlineActions != null) {
if (inlineActions != null) {
for (InlineAction inlineAction : inlineActions) {
final InlineSuggestion inlineActionSuggestion = createInlineAction(isAugmented,
mergedInlinePresentation(request, 0, inlineAction.getInlinePresentation()),