From 92736c1af14ba78180ea269f75e0406aed953d81 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Tue, 13 Nov 2018 12:00:59 -0800
Subject: Minor Content Capture-related changes.

- Refactored onProvideStructureForAssistOrAutofillOrViewCapture() into a common,
  hidden onProvideStructure(viewFor) method on View that (hopefully :-) makes
  it easier to understand / extend.
- Renamed / documentted some methods on TextView.

Bug: 111276913
Test: atest CtsAutoFillServiceTestCases CtsAssistTestCases \
            AssistFrameworksCoreTests:AssistStructureTest

Change-Id: I328ce3f26a42e7408015cc0014a3f707801ebeb9
---
 core/java/android/widget/CompoundButton.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'core/java/android/widget/CompoundButton.java')

diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java
index 8d094898d909..d35bec8d08d5 100644
--- a/core/java/android/widget/CompoundButton.java
+++ b/core/java/android/widget/CompoundButton.java
@@ -578,11 +578,16 @@ public abstract class CompoundButton extends Button implements Checkable {
         stream.addProperty("checked", isChecked());
     }
 
+
+    /** @hide */
     @Override
-    public void onProvideAutofillStructure(ViewStructure structure, int flags) {
-        super.onProvideAutofillStructure(structure, flags);
+    protected void onProvideStructure(@NonNull ViewStructure structure,
+            @ViewStructureType int viewFor, int flags) {
+        super.onProvideStructure(structure, viewFor, flags);
 
-        structure.setDataIsSensitive(!mCheckedFromResource);
+        if (viewFor == VIEW_STRUCTURE_FOR_AUTOFILL) {
+            structure.setDataIsSensitive(!mCheckedFromResource);
+        }
     }
 
     @Override
-- 
cgit v1.2.3