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

Commit 9c3d6286 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

1/ Add test apps from WM shell package into flicker 

Add both apps to the same package to unify all test apps and helpers into a single reusable place

Test: atest FlickerLibTest && atest FlickerTests
Change-Id: I9fa18eb31b50c4e6869352250be0c89a9acb0be8
parent 083a6d9a

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

+147 −78
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        <activity android:name=".SimpleActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.SimpleActivity"

                  android:theme="@style/CutoutShortEdges"

             android:label="SimpleApp"

                  android:label="SimpleActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>
@@ -36,7 +36,7 @@ 
        <activity android:name=".ImeActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.ImeActivity"

                  android:theme="@style/CutoutShortEdges"

             android:label="ImeApp"

                  android:label="ImeActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>
@@ -69,7 +69,7 @@ 
                  android:taskAffinity="com.android.server.wm.flicker.testapp.SeamlessRotationActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:configChanges="orientation|screenSize"

             android:label="SeamlessApp"

                  android:label="SeamlessActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>
@@ -80,7 +80,7 @@ 
                  android:theme="@style/CutoutShortEdges"

                  android:resizeableActivity="false"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.NonResizeableActivity"

            android:label="NonResizeableApp"

                  android:label="NonResizeableActivity"

                  android:exported="true"

                  android:showOnLockScreen="true">

            <intent-filter>
@@ -88,11 +88,11 @@ 
                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

        <activity android:name=".ButtonActivity"

            android:taskAffinity="com.android.server.wm.flicker.testapp.ButtonActivity"

        <activity android:name=".LaunchNewActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.LaunchNewActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:configChanges="orientation|screenSize"

            android:label="ButtonActivity"

                  android:label="LaunchNewActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>
@@ -159,6 +159,7 @@ 
                  android:taskAffinity="com.android.server.wm.flicker.testapp.NotificationActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:configChanges="orientation|screenSize"

                  android:label="NotificationActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>
@@ -194,7 +195,7 @@ 
            android:exported="false"/>

        <activity android:name=".MailActivity"

                  android:exported="true"

            android:label="MailApp"

                  android:label="MailActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.MailActivity"

                  android:theme="@style/Theme.AppCompat.Light">

            <intent-filter>
@@ -207,13 +208,81 @@ 
                  android:immersive="true"

                  android:theme="@android:style/Theme.NoTitleBar"

                  android:configChanges="screenSize"

            android:label="GameApp"

                  android:label="GameActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

        <activity android:name=".PipActivity"

                  android:resizeableActivity="true"

                  android:supportsPictureInPicture="true"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.PipActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:launchMode="singleTop"

                  android:label="PipActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>

            </intent-filter>

        </activity>

        <activity android:name=".SplitScreenActivity"

                  android:resizeableActivity="true"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.SplitScreenActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:label="SplitScreenPrimaryActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

        <activity android:name=".SplitScreenSecondaryActivity"

                  android:resizeableActivity="true"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.SplitScreenSecondaryActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:label="SplitScreenSecondaryActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

        <activity android:name=".SendNotificationActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.SendNotificationActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:label="SendNotificationActivity"

                  android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

        <activity

            android:name=".LaunchBubbleActivity"

            android:label="LaunchBubbleActivity"

            android:exported="true"

            android:theme="@style/CutoutShortEdges"

            android:launchMode="singleTop">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <action android:name="android.intent.action.VIEW"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

        <activity

            android:name=".BubbleActivity"

            android:label="BubbleActivity"

            android:exported="false"

            android:theme="@style/CutoutShortEdges"

            android:resizeableActivity="true"/>

        <service

            android:name=".AssistantInteractionSessionService"

            android:exported="true"

tests/FlickerTests/test-apps/flickerapp/res/drawable/bg.png

0 → 100644
+1.92 KiB
Loading image diff...

tests/FlickerTests/test-apps/flickerapp/res/drawable/ic_bubble.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ 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.

  -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M7.2,14.4m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M14.8,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M15.2,8.8m-4.8,0a4.8,4.8 0,1 1,9.6 0a4.8,4.8 0,1 1,-9.6 0"/>

</vector>

tests/FlickerTests/test-apps/flickerapp/res/drawable/ic_message.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ 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.

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:pathData="M12,4c-4.97,0 -9,3.58 -9,8c0,1.53 0.49,2.97 1.33,4.18c0.12,0.18 0.2,0.46 0.1,0.66c-0.33,0.68 -0.79,1.52 -1.38,2.39c-0.12,0.17 0.01,0.41 0.21,0.39c0.63,-0.05 1.86,-0.26 3.38,-0.91c0.17,-0.07 0.36,-0.06 0.52,0.03C8.55,19.54 10.21,20 12,20c4.97,0 9,-3.58 9,-8S16.97,4 12,4zM16.94,11.63l-3.29,3.29c-0.13,0.13 -0.34,0.04 -0.34,-0.14v-1.57c0,-0.11 -0.1,-0.21 -0.21,-0.2c-2.19,0.06 -3.65,0.65 -5.14,1.95c-0.15,0.13 -0.38,0 -0.33,-0.19c0.7,-2.57 2.9,-4.57 5.5,-4.75c0.1,-0.01 0.18,-0.09 0.18,-0.19V8.2c0,-0.18 0.22,-0.27 0.34,-0.14l3.29,3.29C17.02,11.43 17.02,11.55 16.94,11.63z"

      android:fillColor="#000000"

      android:fillType="evenOdd"/>

</vector>

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

0 → 100644
+48 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ 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.

  -->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <Button

        android:id="@+id/button_finish"

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        android:layout_marginStart="8dp"

        android:text="Finish" />

    <Button

        android:id="@+id/button_new_task"

        android:layout_width="wrap_content"

        android:layout_height="46dp"

        android:layout_marginStart="8dp"

        android:text="New Task" />

    <Button

        android:id="@+id/button_new_bubble"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="8dp"

        android:layout_marginEnd="8dp"

        android:text="New Bubble" />



    <Button

        android:id="@+id/button_activity_for_result"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="8dp"

        android:layout_marginStart="8dp"

        android:text="Activity For Result" />

</LinearLayout>