diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-05-27 18:24:45 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-05-28 17:16:51 -0700 |
| commit | e30e02f5d9a9141c9ee70c712d4f9d52c88ea969 (patch) | |
| tree | 590f001931e5d466298f917f2d75f0b373de3154 /tests | |
| parent | bbd8e6ffc600e078984cb68acf51c660c5c9fc81 (diff) | |
| download | frameworks_base-e30e02f5d9a9141c9ee70c712d4f9d52c88ea969.zip frameworks_base-e30e02f5d9a9141c9ee70c712d4f9d52c88ea969.tar.gz frameworks_base-e30e02f5d9a9141c9ee70c712d4f9d52c88ea969.tar.bz2 | |
Add system layer for voice interaction services.
New window layer that voice interaction service windows
go in to. Includes a new voice-specific content rectangle
that voice activities are placed in to.
Add specific animations for this layer, sliding down from
the top (though this can be customized by the voice interaction
service).
Also add the concept of activities running for voice interaction
services for purposes of adjusting the animation used for them,
again sliding from the top, but not (yet?) customizable by the
voice interaction service.
Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
Diffstat (limited to 'tests')
3 files changed, 4 insertions, 2 deletions
diff --git a/tests/VoiceInteraction/AndroidManifest.xml b/tests/VoiceInteraction/AndroidManifest.xml index ac0f701..2d08163 100644 --- a/tests/VoiceInteraction/AndroidManifest.xml +++ b/tests/VoiceInteraction/AndroidManifest.xml @@ -2,7 +2,8 @@ package="com.android.test.voiceinteraction"> <application> - <activity android:name="VoiceInteractionMain" android:label="Voice Interaction"> + <activity android:name="VoiceInteractionMain" android:label="Voice Interaction" + android:theme="@android:style/Theme.Quantum"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> diff --git a/tests/VoiceInteraction/res/layout/voice_interaction_session.xml b/tests/VoiceInteraction/res/layout/voice_interaction_session.xml index 9fcbf3e..563fa44 100644 --- a/tests/VoiceInteraction/res/layout/voice_interaction_session.xml +++ b/tests/VoiceInteraction/res/layout/voice_interaction_session.xml @@ -19,6 +19,7 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="#ffffffff" + android:fitsSystemWindows="true" > <TextView android:id="@+id/text" diff --git a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java index 6f5788a..a6c09f3 100644 --- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java @@ -93,7 +93,7 @@ public class WindowManagerPermissionTests extends TestCase { } try { - mWm.addAppToken(0, null, 0, 0, 0, false, false, 0, 0); + mWm.addAppToken(0, null, 0, 0, 0, false, false, 0, 0, false); fail("IWindowManager.addAppToken did not throw SecurityException as" + " expected"); } catch (SecurityException e) { |