From 49b043f37d7231b1544cb72e1bfb616e5a00688d Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 7 May 2015 14:21:38 -0700
Subject: Fix issue #20655182: API Review: ViewAssistStructure

Fix the various view assist related APIs.

Also remove the blockAssist view attribute, and instead use
the window's FLAG_SECURE to drive blocking of the entire
hierarchy (which is semantically correct, and will protect
existing apps that have already indicated they need it).

Change-Id: I6beebc86b202809cba0a356cae9607d8d0fb5e78
---
 tests/VoiceInteraction/res/layout/main.xml                          | 6 ------
 .../src/com/android/test/voiceinteraction/AsyncStructure.java       | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/VoiceInteraction/res/layout/main.xml b/tests/VoiceInteraction/res/layout/main.xml
index 34a7563..092d37d 100644
--- a/tests/VoiceInteraction/res/layout/main.xml
+++ b/tests/VoiceInteraction/res/layout/main.xml
@@ -34,12 +34,6 @@
             android:text="@string/asyncStructure"
             />
 
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:assistBlocked="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="This won't be included in assist."
-        />
-
 </LinearLayout>
 
 
diff --git a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/AsyncStructure.java b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/AsyncStructure.java
index 73e04e5..ae8e9e4 100644
--- a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/AsyncStructure.java
+++ b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/AsyncStructure.java
@@ -20,7 +20,7 @@ import android.annotation.Nullable;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.ViewAssistStructure;
+import android.view.ViewStructure;
 import android.widget.TextView;
 
 /**
@@ -32,9 +32,9 @@ public class AsyncStructure extends TextView {
     }
 
     @Override
-    public void onProvideVirtualAssistStructure(ViewAssistStructure structure) {
+    public void onProvideVirtualStructure(ViewStructure structure) {
         structure.setChildCount(1);
-        final ViewAssistStructure child = structure.asyncNewChild(0);
+        final ViewStructure child = structure.asyncNewChild(0);
         final int width = getWidth();
         final int height = getHeight();
         (new Thread() {
-- 
cgit v1.1