Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0134fd81 authored by Barnaby James's avatar Barnaby James
Browse files

Make Test Voice Interactor support new requirements. 

Add settings activity and stub RecognizerService to voice interactor test.

Change-Id: I3c3dda7d2c30eac5e0b889c0c7305dc8f4dfbcb9
parent 6adf47ea

tests/VoiceInteraction/AndroidManifest.xml

+18 −0
Original line number Diff line number Diff line
@@ -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>

tests/VoiceInteraction/res/layout/settings.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?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" />

tests/VoiceInteraction/res/xml/interaction_service.xml

+3 −1
Original line number Diff line number Diff line
@@ -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" />

tests/VoiceInteraction/res/xml/recognition_service.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?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" />

tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainRecognitionService.java

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 * 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");

    }

}