From 49a38c6f1cb586232da6d16cbcf87178c3840367 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Tue, 13 Jun 2017 12:51:43 -0700 Subject: Added BaseAdapter.setAutofillOptions() Also changed ArrayAdapter to use it, when set. Fixes: 37518906 Test: cts-tradefed run commandAndExit cts-dev -m CtsWidgetTestCases -t android.widget.cts.BaseAdapterTest Test: cts-tradefed run commandAndExit cts-dev -m CtsWidgetTestCases -t android.widget.cts.ArrayAdapterTest Test: m update-api Change-Id: I5e883555b0fb9d084b57b9239595bf0632fc41af --- core/java/android/widget/ArrayAdapter.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'core/java/android/widget/ArrayAdapter.java') diff --git a/core/java/android/widget/ArrayAdapter.java b/core/java/android/widget/ArrayAdapter.java index 74f22b35e001..690067b48133 100644 --- a/core/java/android/widget/ArrayAdapter.java +++ b/core/java/android/widget/ArrayAdapter.java @@ -526,6 +526,13 @@ public class ArrayAdapter extends BaseAdapter implements Filterable, ThemedSp */ @Override public CharSequence[] getAutofillOptions() { + // First check if app developer explicitly set them. + final CharSequence[] explicitOptions = super.getAutofillOptions(); + if (explicitOptions != null) { + return explicitOptions; + } + + // Otherwise, only return options that came from static resources. if (!mObjectsFromResources || mObjects == null || mObjects.isEmpty()) { return null; } -- cgit v1.2.3