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

Commit f32b7588 authored Mar 10, 2020 by Automerger Merge Worker

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

Change-Id: I5f1b80dc0ed60fc85e94d437e039d245e8b1dbb6

parents 45f67430 1ebbec56

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

+1 −1

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

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

+1 −2

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