Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ebbec56 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Send inline actions to IME even when inline suggestions are empty" into rvc-dev

parents 3b07f4fa 88fc7ff9

services/autofill/java/com/android/server/autofill/Session.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java

+1 −2
Original line number Diff line number Diff line
@@ -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()),