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

Commit 159b663e authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Split notification and app launch tests in different modules" into... 

Merge "Split notification and app launch tests in different modules" into udc-qpr-dev am: 588cd05e

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



Change-Id: Ieec3c34257ac182b0c6ff3e425e80839ea3ee4a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1333639b 588cd05e

libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifest.xml

+7 −5
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



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

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.wm.shell.flicker">



    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
@@ -57,10 +58,11 @@ 
                <action android:name="android.service.notification.NotificationListenerService" />

            </intent-filter>

        </service>

    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.wm.shell.flicker"

                     android:label="WindowManager Shell Flicker Tests">

    </instrumentation>

        <!-- (b/197936012) Remove startup provider due to test timeout issue -->

        <provider

            android:name="androidx.startup.InitializationProvider"

            android:authorities="${applicationId}.androidx-startup"

            tools:node="remove" />

    </application>

</manifest>

tests/FlickerTests/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ filegroup { 
    srcs: ["src/**/launch/*.kt"],

}



filegroup {

    name: "FlickerTestsNotification-src",

    srcs: ["src/**/notification/*.kt"],

}



filegroup {

    name: "FlickerTestsQuickswitch-src",

    srcs: ["src/**/quickswitch/*.kt"],
@@ -145,6 +150,18 @@ android_test { 
    ],

}



android_test {

    name: "FlickerTestsNotification",

    defaults: ["FlickerTestsDefault"],

    additional_manifests: ["manifests/AndroidManifestNotification.xml"],

    package_name: "com.android.server.wm.flicker.notification",

    instrumentation_target_package: "com.android.server.wm.flicker.notification",

    srcs: [

        ":FlickerTestsBase-src",

        ":FlickerTestsNotification-src",

    ],

}



android_test {

    name: "FlickerTestsQuickswitch",

    defaults: ["FlickerTestsDefault"],

tests/FlickerTests/manifests/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
  -->



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

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.server.wm.flicker">



    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>
@@ -47,5 +48,11 @@ 
    <application android:requestLegacyExternalStorage="true" android:largeHeap="true">

        <uses-library android:name="android.test.runner"/>

        <uses-library android:name="androidx.window.extensions" android:required="false"/>



        <!-- (b/197936012) Remove startup provider due to test timeout issue -->

        <provider

            android:name="androidx.startup.InitializationProvider"

            android:authorities="${applicationId}.androidx-startup"

            tools:node="remove" />

    </application>

</manifest>

tests/FlickerTests/manifests/AndroidManifestNotification.xml

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

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

  -->



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

    package="com.android.server.wm.flicker.close">



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

                     android:targetPackage="com.android.server.wm.flicker.notification"

                     android:label="WindowManager Flicker Tests">

    </instrumentation>

</manifest>

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenNotificationColdTest.kt→tests/FlickerTests/src/com/android/server/wm/flicker/notification/OpenAppFromLockscreenNotificationColdTest.kt

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * Copyright (C) 2023 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.wm.flicker.launch

package com.android.server.wm.flicker.notification



import android.platform.test.annotations.Postsubmit

import android.platform.test.rule.SettingOverrideRule