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

Commit 8f3b5bc7 authored by Benno Lin's avatar Benno Lin Committed by Automerger Merge Worker
Browse files

Merge "Create test app to emulate assistant UI." into tm-qpr-dev am: 4e330bd3 am: 1d45f10c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19928112



Change-Id: Ibb49b564cab16af899e0c0f6069eab941ada79a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da54b283 1d45f10c

tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml

+29 −0
Original line number Diff line number Diff line
@@ -214,5 +214,34 @@ 
                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

        <service

            android:name=".AssistantInteractionSessionService"

            android:exported="true"

            android:permission="android.permission.BIND_VOICE_INTERACTION" />

        <service

            android:name=".AssistantRecognitionService"

            android:exported="true"

            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>

        <service

            android:name=".AssistantInteractionService"

            android:exported="true"

            android:label="Test Voice Interaction Service"

            android:permission="android.permission.BIND_VOICE_INTERACTION">

            <intent-filter>

                <action android:name="android.service.voice.VoiceInteractionService" />

            </intent-filter>

            <meta-data

                android:name="android.voice_interaction"

                android:resource="@xml/interaction_service" />

        </service>

    </application>

    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />

</manifest>

tests/FlickerTests/test-apps/flickerapp/res/layout/assistant_session.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 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.

  -->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <FrameLayout

        android:id="@+id/vis_frame"

        android:layout_width="match_parent"

        android:layout_height="300dp"

        android:layout_gravity="bottom"

        android:background="#37474F"/>

</FrameLayout>

tests/FlickerTests/test-apps/flickerapp/res/xml/interaction_service.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 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.

  -->



<voice-interaction-service xmlns:android="http://schemas.android.com/apk/res/android"

    android:recognitionService="com.android.server.wm.flicker.testapp.AssistantRecognitionService"

    android:sessionService="com.android.server.wm.flicker.testapp.AssistantInteractionSessionService"

    android:supportsAssist="true" />

tests/FlickerTests/test-apps/flickerapp/res/xml/recognition_service.xml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 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" />

tests/FlickerTests/test-apps/flickerapp/src/com/android/server/wm/flicker/testapp/AssistantInteractionService.java

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

 * Copyright (C) 2022 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.server.wm.flicker.testapp;



import android.service.voice.VoiceInteractionService;



public class AssistantInteractionService extends VoiceInteractionService {

}