From 911cb1fa768614732d08ece70cbeab5158ecec15 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Thu, 16 May 2019 14:18:42 -0700 Subject: DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit. This reverts commit ef1c0b36ab402c9f936220dd4f64f4ac96f52e37. Test: atest CtsContentCaptureServiceTestCases Test: m update-api Bug: 130726495 Change-Id: Iecda9df96722ac8a3184710796032b6c01bd8ea3 --- core/java/android/widget/AdapterView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/java/android/widget/AdapterView.java') diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java index c3bb9a0201d0..c55f7d654548 100644 --- a/core/java/android/widget/AdapterView.java +++ b/core/java/android/widget/AdapterView.java @@ -1318,7 +1318,8 @@ public abstract class AdapterView extends ViewGroup { @ViewStructureType int viewFor, int flags) { super.onProvideStructure(structure, viewFor, flags); - if (viewFor == VIEW_STRUCTURE_FOR_AUTOFILL) { + if (viewFor == VIEW_STRUCTURE_FOR_AUTOFILL + || viewFor == VIEW_STRUCTURE_FOR_CONTENT_CAPTURE) { final Adapter adapter = getAdapter(); if (adapter == null) return; -- cgit v1.2.3