diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-05-29 00:18:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-29 00:18:25 +0000 |
| commit | a923758d80ad50ac79a22074cf6e4c9463bb2b0b (patch) | |
| tree | ba990ca10516af629e5406094ccf8f8521c2d1c3 /tests | |
| parent | 3326a8782f7aae58b76b96d52d7756787ab401d0 (diff) | |
| parent | e30e02f5d9a9141c9ee70c712d4f9d52c88ea969 (diff) | |
| download | frameworks_base-a923758d80ad50ac79a22074cf6e4c9463bb2b0b.zip frameworks_base-a923758d80ad50ac79a22074cf6e4c9463bb2b0b.tar.gz frameworks_base-a923758d80ad50ac79a22074cf6e4c9463bb2b0b.tar.bz2 | |
Merge "Add system layer for voice interaction services." into lmp-preview-dev
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) { |