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

Commit b80ad841 authored by Daniel Akinola's avatar Daniel Akinola
Browse files

Clean up PSS App Selector Recents Split Screen flag 

Removing usages of the flag since its been fully ramped up now

Bug: 409607643
Test: EXEMPT refactor only
Flag: EXEMPT refactor only
Change-Id: Ic7616d3bc981240efadc94918b4d0ea7cd35866b
parent 1b14a5f1

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

+1 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.view.View 
import android.view.ViewGroup

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_PSS_APP_SELECTOR_RECENTS_SPLIT_SCREEN

import com.android.systemui.SysuiTestCase

import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorResultHandler

import com.android.systemui.mediaprojection.appselector.data.RecentTask
@@ -106,7 +105,6 @@ class MediaProjectionRecentsViewControllerTest : SysuiTestCase() { 


    @Test

    fun onRecentAppClicked_splitScreenTaskWithSameIdIsStartedFromRecents() {

        mSetFlagsRule.enableFlags(FLAG_PSS_APP_SELECTOR_RECENTS_SPLIT_SCREEN)

        controller.onRecentAppClicked(splitScreenTask, taskView)



        verify(splitScreen.get())
@@ -145,8 +143,7 @@ class MediaProjectionRecentsViewControllerTest : SysuiTestCase() { 
    }



    @Test

    fun onRecentAppClicked_splitScreenTaskInForeground_flagOn_usesDefaultAnimation() {

        mSetFlagsRule.enableFlags(FLAG_PSS_APP_SELECTOR_RECENTS_SPLIT_SCREEN)

    fun onRecentAppClicked_splitScreenTaskInForeground_usesDefaultAnimation() {

        assertForegroundTaskUsesDefaultCloseAnimation(splitScreenTask)

    }

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

+1 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.view.ViewGroup 
import android.window.RemoteTransition

import androidx.recyclerview.widget.LinearLayoutManager

import androidx.recyclerview.widget.RecyclerView

import com.android.systemui.Flags.pssAppSelectorRecentsSplitScreen

import com.android.systemui.display.naturalBounds

import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorResultHandler

import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorScope
@@ -147,9 +146,7 @@ constructor( 
        val splitBounds = task.splitBounds

        val handleResult: () -> Unit = { resultHandler.returnSelectedApp(launchCookie, taskId)}



        if (pssAppSelectorRecentsSplitScreen() &&

            task.isLaunchingInSplitScreen() &&

            !task.isForegroundTask) {

        if (task.isLaunchingInSplitScreen() && !task.isForegroundTask) {

            startSplitScreenTask(view, taskId, splitBounds!!, handleResult, activityOptions)

        } else {

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