diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-17 18:04:14 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-07-20 12:49:10 -0700 |
| commit | 17f693520da8977c4a60f5b4be3be035cba7146c (patch) | |
| tree | 6e3fcf5d6adb3d72ab5b7c2300f3bb8ebe8bc550 /tests/VoiceInteraction/res/layout/voice_interaction_session.xml | |
| parent | 5aff3b5489262ccff4b6f9e18e0d990ebfe4d7bc (diff) | |
| download | frameworks_base-17f693520da8977c4a60f5b4be3be035cba7146c.zip frameworks_base-17f693520da8977c4a60f5b4be3be035cba7146c.tar.gz frameworks_base-17f693520da8977c4a60f5b4be3be035cba7146c.tar.bz2 | |
Fix issue #22531747: Assist info should declare if user has disabled...
...context and/or screenshot
Added new API to find out what contextual data has been globally disabled.
Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).
Also added a new Activity.showAssist() API because... well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.
Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
Diffstat (limited to 'tests/VoiceInteraction/res/layout/voice_interaction_session.xml')
| -rw-r--r-- | tests/VoiceInteraction/res/layout/voice_interaction_session.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/VoiceInteraction/res/layout/voice_interaction_session.xml b/tests/VoiceInteraction/res/layout/voice_interaction_session.xml index dc4e31b..b106437 100644 --- a/tests/VoiceInteraction/res/layout/voice_interaction_session.xml +++ b/tests/VoiceInteraction/res/layout/voice_interaction_session.xml @@ -80,6 +80,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Disallow screenshot" /> + <TextView android:id="@+id/options_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" /> </LinearLayout> </LinearLayout> |