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

Commit 8ab6d34c authored by Thales Lima's avatar Thales Lima
Browse files

Change taskAffinity for DesktopWallpaperActivity 

Given that we want DesktopWallpaperActivity to always stay in the background and not interrupt other Activities, a different Task makes it stay on its own. This also fix the recording bug, where we were starting MediaProjectionAppSelectorActivity in the same task.

Fixes: 436478247
Test: m && manual test
Test: StartAppScreenRecordingFromNotificationTest
Flag: EXEMPT small bugfix; change in AndroidManifest
Change-Id: Ic809a5199a3e24e01e38ec000039d17b2c27aa02
parent bbb4c36f

libs/WindowManager/Shell/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
            android:excludeFromRecents="true"

            android:launchMode="singleInstancePerTask"

            android:showForAllUsers="true"

            android:theme="@style/DesktopWallpaperTheme" />

            android:theme="@style/DesktopWallpaperTheme"

            android:taskAffinity="com.android.wm.shell.desktop_wallpaper"/>



        <activity

            android:name=".bubbles.shortcut.CreateBubbleShortcutActivity"

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ java_library { 
        "wm-flicker-common-app-helpers",

        "launcher-helper-lib",

        "launcher-aosp-tapl",

        "systemui-tapl",

        "sysui-helper",

        "systemui-helper",

        "desktop-test-lib",

    ],

}

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/mediaprojection/StartAppScreenRecordingFromNotificationTest.kt

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

 * Copyright (C) 2025 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.wm.shell.functional.mediaprojection



import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDesktopDevice

import android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.StartAppScreenRecordingFromNotification

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner



/** Functional test for [StartAppScreenRecordingFromNotification]. */

@RunWith(BlockJUnit4ClassRunner::class)

@RequiresDesktopDevice

@Presubmit

@ScreenRecordRule.ScreenRecord

class StartAppScreenRecordingFromNotificationTest : StartAppScreenRecordingFromNotification()

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/StartAppScreenRecordingFromNotification.kt

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

 * Copyright (C) 2025 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.wm.shell.scenarios



import android.app.Instrumentation

import android.platform.systemui_tapl.controller.QuickSettingsController

import android.platform.systemui_tapl.ui.Root

import android.tools.Rotation

import android.tools.helpers.SYSTEMUI_PACKAGE

import android.tools.traces.component.ComponentNameMatcher

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.By

import androidx.test.uiautomator.BySelector

import androidx.test.uiautomator.UiDevice

import androidx.test.uiautomator.UiObject2

import androidx.test.uiautomator.Until

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.server.wm.flicker.helpers.DesktopModeAppHelper

import com.android.server.wm.flicker.helpers.SimpleAppHelper

import java.util.regex.Pattern

import org.junit.After

import org.junit.Before

import org.junit.Ignore

import org.junit.Test



/**

 * Test for starting screen recording from a QS Tile while in Desktop:

 * - Start Desktop Mode by moving an app to Desktop.

 * - Open the notification shade and use a QuickSettings Tile for start screen recording.

 * - Then make sure the panel for single app selection appears.

 */

@Ignore("Test Base Class")

abstract class StartAppScreenRecordingFromNotification(val rotation: Rotation = Rotation.ROTATION_0) :

    TestScenarioBase(rotation) {



    val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    val tapl = LauncherInstrumentation()

    val wmHelper = WindowManagerStateHelper(instrumentation)

    val device = UiDevice.getInstance(instrumentation)

    private val packageManager = instrumentation.context.packageManager



    val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

    private val sysuiSelectorApp =

        ComponentNameMatcher(

            SYSTEMUI_PACKAGE,

            "com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorActivity"

        )



    @Before

    fun setup() {

        QuickSettingsController.get().addAsFirstTile(SCREEN_RECORD_TILE_NAME)

        testApp.enterDesktopMode(wmHelper, device)

    }



    @Test

    open fun startMediaProjection() {

        startSingleAppMediaProjection(wmHelper)

    }



    @After

    fun teardown() {

        testApp.exit(wmHelper)

    }



    fun startSingleAppMediaProjection(

        wmHelper: WindowManagerStateHelper,

    ) {

        openScreenRecorder()

        chooseSingleAppOption()

        startScreenSharing()

        wmHelper

            .StateSyncBuilder()

            .withWindowSurfaceAppeared(sysuiSelectorApp)

            .waitForAndVerify()

    }



    protected fun openScreenRecorder() {

        // Swipe down to show the notification shade

        Root.get().openNotificationShadeViaSwipeFromTop()



        // Launch the screen recorder by clicking the QuickSettings tile

        val screenRecordQS = findObject(By.text("Screen record"))

        screenRecordQS.click()

        instrumentation.uiAutomation.syncInputTransactions()



        // Wait for the app selection to launch

        Root.get().mediaProjectionPermissionDialog

    }



    private fun chooseSingleAppOption() {

        findObject(By.res(SCREEN_SHARE_OPTIONS_PATTERN)).also { it.click() }



        val singleAppString = getSysUiResourceString(SINGLE_APP_STRING_RES_NAME)

        findObject(By.text(singleAppString)).also { it.click() }

    }



    private fun startScreenSharing() {

        findObject(By.res(ACCEPT_RESOURCE_ID)).also { it.click() }

    }



    private fun findObject(selector: BySelector): UiObject2 =

        device.wait(Until.findObject(selector), TIMEOUT) ?: error("Can't find object $selector")



    private fun getSysUiResourceString(resName: String): String =

        with(packageManager.getResourcesForApplication(SYSTEMUI_PACKAGE)) {

            getString(getIdentifier(resName, "string", SYSTEMUI_PACKAGE))

        }



    companion object {

        const val SCREEN_RECORD_TILE_NAME = "screenrecord"

        const val TIMEOUT: Long = 5000L

        const val ACCEPT_RESOURCE_ID: String = "android:id/button1"

        val SCREEN_SHARE_OPTIONS_PATTERN: Pattern =

            Pattern.compile("$SYSTEMUI_PACKAGE:id/screen_share_mode_(options|spinner)")

        const val SINGLE_APP_STRING_RES_NAME: String =

            "screenrecord_permission_dialog_option_text_single_app"

    }

}