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

Commit bc1ff3a9 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Don't filter pinned inline suggestions." into rvc-dev am: 56cfc324 am: 081e6b88 am: a0c14104 am: 42ce1c32" into rvc-qpr-dev-plus-aosp
parents 8939c648 637afd7a

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,