From 704b9f82c345da2d63bc2785fb3733b486d3e119 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Mon, 27 Apr 2015 16:18:37 -0700 Subject: Extended test to support launching assist above lock screen Change-Id: Ic65e638eed214a240cc13666f857e9b297f28168 --- tests/Assist/AndroidManifest.xml | 10 ++++ tests/Assist/res/layout/keyguard_preview.xml | 61 ++++++++++++++++++++++ tests/Assist/res/xml/interaction_service.xml | 3 +- .../android/test/assist/AboveKeyguardActivity.java | 37 +++++++++++++ .../test/assist/AssistInteractionService.java | 9 +++- 5 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 tests/Assist/res/layout/keyguard_preview.xml create mode 100644 tests/Assist/src/com/android/test/assist/AboveKeyguardActivity.java (limited to 'tests') diff --git a/tests/Assist/AndroidManifest.xml b/tests/Assist/AndroidManifest.xml index 4eceed9..9d4c4ad 100644 --- a/tests/Assist/AndroidManifest.xml +++ b/tests/Assist/AndroidManifest.xml @@ -30,10 +30,20 @@ + + + diff --git a/tests/Assist/res/layout/keyguard_preview.xml b/tests/Assist/res/layout/keyguard_preview.xml new file mode 100644 index 0000000..d56c52e --- /dev/null +++ b/tests/Assist/res/layout/keyguard_preview.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Assist/res/xml/interaction_service.xml b/tests/Assist/res/xml/interaction_service.xml index f56156e..a90c824 100644 --- a/tests/Assist/res/xml/interaction_service.xml +++ b/tests/Assist/res/xml/interaction_service.xml @@ -18,4 +18,5 @@ + android:supportsAssist="true" + android:supportsLaunchVoiceAssistFromKeyguard="true"/> diff --git a/tests/Assist/src/com/android/test/assist/AboveKeyguardActivity.java b/tests/Assist/src/com/android/test/assist/AboveKeyguardActivity.java new file mode 100644 index 0000000..3e37345 --- /dev/null +++ b/tests/Assist/src/com/android/test/assist/AboveKeyguardActivity.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.test.assist; + +import android.annotation.Nullable; +import android.app.Activity; +import android.os.Bundle; +import android.view.WindowManager; + +import com.android.test.assist.R; + +/** + * An activity which can be shown above the keyguard. + */ +public class AboveKeyguardActivity extends Activity { + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); + setContentView(R.layout.keyguard_preview); + } +} diff --git a/tests/Assist/src/com/android/test/assist/AssistInteractionService.java b/tests/Assist/src/com/android/test/assist/AssistInteractionService.java index e6a6713..bf40747 100644 --- a/tests/Assist/src/com/android/test/assist/AssistInteractionService.java +++ b/tests/Assist/src/com/android/test/assist/AssistInteractionService.java @@ -16,8 +16,15 @@ package com.android.test.assist; +import android.content.Intent; import android.service.voice.VoiceInteractionService; public class AssistInteractionService extends VoiceInteractionService { - + @Override + public void onLaunchVoiceAssistFromKeyguard() { + super.onLaunchVoiceAssistFromKeyguard(); + Intent intent = new Intent(this, AboveKeyguardActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } } -- cgit v1.1