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

Commit 081e6b88 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "Don't filter pinned inline suggestions." into rvc-dev am: 56cfc324 

Change-Id: I432f6ce6cf9b4fb8db689aad63cac729cd38cb6b
parents 6c07b888 56cfc324

core/java/android/service/autofill/InlinePresentation.java

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ public final class InlinePresentation implements Parcelable { 
    private final @NonNull InlinePresentationSpec mInlinePresentationSpec;



    /**

     * Indicates whether the UI should be pinned, hence non-scrollable, in the host.

     * Indicates whether the UI should be pinned, hence non-scrollable and non-filterable, in the

     * host.

     */

    private final boolean mPinned;

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

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ public final class InlineSuggestionFactory { 
                Slog.w(TAG, "InlinePresentation not found in dataset");

                continue;

            }

            if (!includeDataset(dataset, fieldIndex, filterText)) {

            if (!inlinePresentation.isPinned()  // don't filter pinned suggestions

                    && !includeDataset(dataset, fieldIndex, filterText)) {

                continue;

            }

            InlineSuggestion inlineSuggestion = createInlineSuggestion(isAugmented, dataset,