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

Commit d8589393 authored by Daniel Akinola's avatar Daniel Akinola Committed by Android (Google) Code Review
Browse files

Merge "Fix Partial Screenshare always launching split root when launching task... 

Merge "Fix Partial Screenshare always launching split root when launching task from recents" into main
parents 31d917a5 8e5d5009

packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTask.kt

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.ComponentName 


data class RecentTask(

    val taskId: Int,

    val displayId: Int,

    @UserIdInt val userId: Int,

    val topActivityComponent: ComponentName?,

    val baseIntentComponent: ComponentName?,

packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/data/RecentTaskListProvider.kt

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ constructor( 
                .map {

                    RecentTask(

                        it.taskId,

                        it.displayId,

                        it.userId,

                        it.topActivity,

                        it.baseIntent?.component,

packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/view/MediaProjectionRecentsViewController.kt

+2 −2
Original line number Diff line number Diff line
@@ -130,10 +130,10 @@ constructor( 
                view.width,

                view.height

            )

        activityOptions.setPendingIntentBackgroundActivityStartMode(

        activityOptions.pendingIntentBackgroundActivityStartMode =

            MODE_BACKGROUND_ACTIVITY_START_ALLOWED

        )

        activityOptions.launchCookie = launchCookie

        activityOptions.launchDisplayId = task.displayId



        activityTaskManager.startActivityFromRecents(task.taskId, activityOptions.toBundle())

        resultHandler.returnSelectedApp(launchCookie)

packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorControllerTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ class MediaProjectionAppSelectorControllerTest : SysuiTestCase() { 
    ): RecentTask {

        return RecentTask(

            taskId = taskId,

            displayId = 0,

            topActivityComponent = topActivityComponent,

            baseIntentComponent = ComponentName("com", "Test"),

            userId = userId,

packages/SystemUI/tests/src/com/android/systemui/mediaprojection/appselector/data/ShellRecentTaskListProviderTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ class ShellRecentTaskListProviderTest : SysuiTestCase() { 
    private fun createRecentTask(taskId: Int): RecentTask =

        RecentTask(

            taskId = taskId,

            displayId = 0,

            userId = 0,

            topActivityComponent = null,

            baseIntentComponent = null,