Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Don't filter pinned inline suggestions." into rvc-dev am: 56cfc32424 am: 081e6b88ac am: a0c14104a6 am: 42ce1c3280" into rvc-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-03-25 23:13:52 +00:00
committed by Android (Google) Code Review
parent 8939c648ac 637afd7a03
commit bc1ff3a98d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/service/autofill/InlinePresentation.java
View File

@@ -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;

3
services/autofill/java/com/android/server/autofill/ui/InlineSuggestionFactory.java
View File

@@ -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,