am 69d4c16b: am fc5a45fd: am 57ab4478: Merge "Make Test Voice Interactor support new requirements." into lmp-dev

* commit '69d4c16bd7fe2530f8fd35f04b87cb3034d8bafe':
  Make Test Voice Interactor support new requirements.

6 files changed, 149 insertions, 1 deletions

diff --git a/tests/VoiceInteraction/AndroidManifest.xml b/tests/VoiceInteraction/AndroidManifest.xml
index c328b3c..06d31a4 100644
--- a/tests/VoiceInteraction/AndroidManifest.xml
+++ b/tests/VoiceInteraction/AndroidManifest.xml
@@ -12,7 +12,17 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="SettingsActivity"
+                android:label="Voice Interaction Settings"
+                android:excludeFromRecents="true"
+                android:noHistory="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <service android:name="MainInteractionService"
+                android:label="Test Voice Interaction Service"
                 android:permission="android.permission.BIND_VOICE_INTERACTION"
                 android:process=":interactor">
             <meta-data android:name="android.voice_interaction"
@@ -25,6 +35,14 @@
                 android:permission="android.permission.BIND_VOICE_INTERACTION"
                 android:process=":session">
         </service>
+        <service android:name="MainRecognitionService"
+                android:label="Test Voice Interaction Service">
+            <intent-filter>
+                <action android:name="android.speech.RecognitionService" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="android.speech" android:resource="@xml/recognition_service" />
+        </service>
         <activity android:name="TestInteractionActivity" android:label="Voice Interaction Target"
                   android:theme="@android:style/Theme.Material.Light.Voice">
             <intent-filter>
diff --git a/tests/VoiceInteraction/res/layout/settings.xml b/tests/VoiceInteraction/res/layout/settings.xml
new file mode 100644
index 0000000..e123449
--- /dev/null
+++ b/tests/VoiceInteraction/res/layout/settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:text="Preferences placeholder" />
diff --git a/tests/VoiceInteraction/res/xml/interaction_service.xml b/tests/VoiceInteraction/res/xml/interaction_service.xml
index 45bd994d..ce5669c 100644
--- a/tests/VoiceInteraction/res/xml/interaction_service.xml
+++ b/tests/VoiceInteraction/res/xml/interaction_service.xml
@@ -18,4 +18,6 @@
 -->
 
 <voice-interaction-service xmlns:android="http://schemas.android.com/apk/res/android"
-    android:sessionService="com.android.test.voiceinteraction.MainInteractionSessionService" />
+    android:sessionService="com.android.test.voiceinteraction.MainInteractionSessionService"
+    android:recognitionService="com.android.test.voiceinteraction.MainRecognitionService"
+    android:settingsActivity="com.android.test.voiceinteraction.SettingsActivity" />
diff --git a/tests/VoiceInteraction/res/xml/recognition_service.xml b/tests/VoiceInteraction/res/xml/recognition_service.xml
new file mode 100644
index 0000000..b720fc4
--- /dev/null
+++ b/tests/VoiceInteraction/res/xml/recognition_service.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2014, 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.
+ */
+-->
+
+<recognition-service xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="com.android.test.voiceinteraction.SettingsActivity" />
diff --git a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainRecognitionService.java b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainRecognitionService.java
new file mode 100644
index 0000000..c716e7a
--- /dev/null
+++ b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainRecognitionService.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2014 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.voiceinteraction;
+
+import android.content.Intent;
+import android.speech.RecognitionService;
+import android.util.Log;
+
+/**
+ * Stub recognition service needed to be a complete voice interactor.
+ */
+public class MainRecognitionService extends RecognitionService {
+
+    private static final String TAG = "MainRecognitionService";
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        Log.i(TAG, "onCreate");
+    }
+
+    @Override
+    protected void onStartListening(Intent recognizerIntent, Callback listener) {
+        Log.d(TAG, "onStartListening");
+    }
+
+    @Override
+    protected void onCancel(Callback listener) {
+        Log.d(TAG, "onCancel");
+    }
+
+    @Override
+    protected void onStopListening(Callback listener) {
+        Log.d(TAG, "onStopListening");
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Log.d(TAG, "onDestroy");
+    }
+}
diff --git a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/SettingsActivity.java b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/SettingsActivity.java
new file mode 100644
index 0000000..8b346ff
--- /dev/null
+++ b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/SettingsActivity.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 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.voiceinteraction;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * Stub activity to test out settings selection for voice interactor.
+ */
+public class SettingsActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings);
+    }
+}