diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-05-08 20:42:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 20:42:12 +0000 |
| commit | ed9af066b2407a36699fae2e475c4d1b53d2ca1d (patch) | |
| tree | 005f834b928f7a47220e1468b7aa90d6fee1bfd3 /tests | |
| parent | 180fd27832b429aaca0a35e8b93c88195b6451be (diff) | |
| parent | 49b043f37d7231b1544cb72e1bfb616e5a00688d (diff) | |
| download | frameworks_base-ed9af066b2407a36699fae2e475c4d1b53d2ca1d.zip frameworks_base-ed9af066b2407a36699fae2e475c4d1b53d2ca1d.tar.gz frameworks_base-ed9af066b2407a36699fae2e475c4d1b53d2ca1d.tar.bz2 | |
Merge "Fix issue #20655182: API Review: ViewAssistStructure" into mnc-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/VoiceInteraction/res/layout/main.xml | 6 | ||||
| -rw-r--r-- | tests/VoiceInteraction/src/com/android/test/voiceinteraction/AsyncStructure.java | 6 |
2 files changed, 3 insertions, 9 deletions
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() { |