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

Commit 50705198 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Send inline actions to IME even when inline suggestions are empty" into... 

Merge "Send inline actions to IME even when inline suggestions are empty" into rvc-dev am: 1ebbec56 am: f32b7588 am: e91b2954 am: 9f065f69

Change-Id: I78b94b3c84f3d33b3bda5e4086e80869764699fa
parents 48417f48 9f065f69

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()),