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

Browse Source 
Change-Id: Ie636e5db3103a0b5bb7c8aaf904612e8f23c9f74
This commit is contained in:
Automerger Merge Worker
2020-03-10 22:26:51 +00:00
parent 2dc62d53e5 f32b75885f
commit e91b2954c5
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, response, filterText, response.getInlineActions(), mCurrentViewId,
this, () -> { this, () -> {
synchronized (mLock) { synchronized (mLock) {
requestHideFillUi(mCurrentViewId); mInlineSuggestionSession.hideInlineSuggestionsUi(mCurrentViewId);
} }
}, remoteRenderService); }, remoteRenderService);
if (inlineSuggestionsResponse == null) { 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); inlineSuggestions.add(inlineSuggestion);
} }
// We should only add inline actions if there is at least one suggestion. if (inlineActions != null) {
if (!inlineSuggestions.isEmpty() && inlineActions != null) {
for (InlineAction inlineAction : inlineActions) { for (InlineAction inlineAction : inlineActions) {
final InlineSuggestion inlineActionSuggestion = createInlineAction(isAugmented, final InlineSuggestion inlineActionSuggestion = createInlineAction(isAugmented,
mergedInlinePresentation(request, 0, inlineAction.getInlinePresentation()), mergedInlinePresentation(request, 0, inlineAction.getInlinePresentation()),