diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-15 14:20:51 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-07-15 14:20:51 -0700 |
| commit | 1de1186d28f0ca7c0b6298edfa8ae497e651ba87 (patch) | |
| tree | a2fb5d493d38c1e5879a6e37e3e9d2773d8823aa /tests/VoiceInteraction/res | |
| parent | 1d4247c4cc89c6d62e44ed3115f26579979b44b5 (diff) | |
| download | frameworks_base-1de1186d28f0ca7c0b6298edfa8ae497e651ba87.zip frameworks_base-1de1186d28f0ca7c0b6298edfa8ae497e651ba87.tar.gz frameworks_base-1de1186d28f0ca7c0b6298edfa8ae497e651ba87.tar.bz2 | |
Implement issue #22403908: Enable assistant to refuse context sharing
New APIs allow the voice interaction service to set/retrieve a filter
for which of the show flags are allowed.
Change-Id: I588cbe55afee0548ad3afa22d3a7d3bc43cb54a6
Diffstat (limited to 'tests/VoiceInteraction/res')
| -rw-r--r-- | tests/VoiceInteraction/res/layout/voice_interaction_session.xml | 71 |
1 files changed, 47 insertions, 24 deletions
diff --git a/tests/VoiceInteraction/res/layout/voice_interaction_session.xml b/tests/VoiceInteraction/res/layout/voice_interaction_session.xml index 610f30b..dc4e31b 100644 --- a/tests/VoiceInteraction/res/layout/voice_interaction_session.xml +++ b/tests/VoiceInteraction/res/layout/voice_interaction_session.xml @@ -31,33 +31,56 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> - <LinearLayout android:id="@+id/top_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:orientation="horizontal" - android:background="#ffffffff" - android:elevation="8dp" - > - <ImageView android:id="@+id/screenshot" - android:layout_width="wrap_content" - android:layout_height="46dp" - android:adjustViewBounds="true" /> - <View android:layout_width="0dp" - android:layout_height="0dp" - android:layout_weight="1" /> - <Button android:id="@+id/do_tree" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/tree" /> - <Button android:id="@+id/do_text" - android:layout_width="wrap_content" + android:layout_gravity="top" + android:orientation="vertical" + android:background="#ffffffff" + android:elevation="8dp" + > + <LinearLayout android:id="@+id/top_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/text" /> - <Button android:id="@+id/start" - android:layout_width="wrap_content" + android:orientation="horizontal" + > + <ImageView android:id="@+id/screenshot" + android:layout_width="wrap_content" + android:layout_height="46dp" + android:adjustViewBounds="true" /> + <View android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" /> + <CheckBox android:id="@+id/show_options" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <Button android:id="@+id/do_tree" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/tree" /> + <Button android:id="@+id/do_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/text" /> + <Button android:id="@+id/start" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/start" /> + </LinearLayout> + <LinearLayout android:id="@+id/options" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/start" /> + android:orientation="vertical" + > + <CheckBox android:id="@+id/disallow_structure" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Disallow context" /> + <CheckBox android:id="@+id/disallow_screenshot" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Disallow screenshot" /> + </LinearLayout> </LinearLayout> <LinearLayout android:id="@+id/bottom_content" |