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

Commit 61924556 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change wallpaper on user 0 flag to bug fix." into main

parents 9ae344c1 59c0d849

core/java/android/window/flags/lse_desktop_experience.aconfig

+4 −1
Original line number Diff line number Diff line
@@ -531,8 +531,11 @@ flag { 
}



flag {

    name: "enable_desktop_wallpaper_activity_on_system_user"

    name: "enable_desktop_wallpaper_activity_for_system_user"

    namespace: "lse_desktop_experience"

    description: "Enables starting DesktopWallpaperActivity on system user."

    bug: "385294350"

    metadata {

       purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+2 −2
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ class DesktopTasksController( 


    private fun addWallpaperActivity(displayId: Int, wct: WindowContainerTransaction) {

        logV("addWallpaperActivity")

        if (Flags.enableDesktopWallpaperActivityOnSystemUser()) {

        if (Flags.enableDesktopWallpaperActivityForSystemUser()) {

            val intent = Intent(context, DesktopWallpaperActivity::class.java)

            val options =

                ActivityOptions.makeBasic().apply {
@@ -1398,7 +1398,7 @@ class DesktopTasksController( 
    private fun removeWallpaperActivity(wct: WindowContainerTransaction) {

        desktopWallpaperActivityTokenProvider.getToken()?.let { token ->

            logV("removeWallpaperActivity")

            if (Flags.enableDesktopWallpaperActivityOnSystemUser()) {

            if (Flags.enableDesktopWallpaperActivityForSystemUser()) {

                wct.reorder(token, /* onTop= */ false)

            } else {

                wct.removeTask(token)

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserver.kt

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ class DesktopTasksTransitionObserver( 
        if (transitionToCloseWallpaper == transition) {

            // TODO: b/362469671 - Handle merging the animation when desktop is also closing.

            desktopWallpaperActivityTokenProvider.getToken()?.let { wallpaperActivityToken ->

                if (Flags.enableDesktopWallpaperActivityOnSystemUser()) {

                if (Flags.enableDesktopWallpaperActivityForSystemUser()) {

                    transitions.startTransition(

                        TRANSIT_TO_BACK,

                        WindowContainerTransaction()

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+15 −15
Original line number Diff line number Diff line
@@ -1497,7 +1497,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun moveToFullscreen_tdaFullscreen_windowingModeUndefined_removesWallpaperActivity() {

        val task = setUpFreeformTask()

        assertNotNull(rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY))
@@ -1530,7 +1530,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun moveToFullscreen_tdaFreeform_windowingModeFullscreen_removesWallpaperActivity() {

        val task = setUpFreeformTask()
@@ -1965,7 +1965,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun onDesktopWindowClose_singleActiveTask_hasWallpaperActivityToken() {

        val task = setUpFreeformTask()
@@ -2011,7 +2011,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun onDesktopWindowClose_multipleActiveTasks_isOnlyNonClosingTask() {

        val task1 = setUpFreeformTask()

        val task2 = setUpFreeformTask()
@@ -2025,7 +2025,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun onDesktopWindowClose_multipleActiveTasks_hasMinimized() {

        val task1 = setUpFreeformTask()

        val task2 = setUpFreeformTask()
@@ -2095,7 +2095,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun onTaskMinimize_singleActiveTask_hasWallpaperActivityToken_removesWallpaper() {

        val task = setUpFreeformTask()

        val transition = Binder()
@@ -2147,7 +2147,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun onDesktopWindowMinimize_multipleActiveTasks_minimizesTheOnlyVisibleTask_removesWallpaper() {

        val task1 = setUpFreeformTask(active = true)

        val task2 = setUpFreeformTask(active = true)
@@ -2808,7 +2808,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    @Test

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,

    )

    fun handleRequest_backTransition_singleTaskWithToken_removesWallpaper() {

        val task = setUpFreeformTask()
@@ -2849,7 +2849,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,

    )

    fun handleRequest_backTransition_multipleTasksSingleNonClosing_removesWallpaperAndTask() {

        val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)
@@ -2867,7 +2867,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    @Test

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,

    )

    fun handleRequest_backTransition_multipleTasksSingleNonMinimized_removesWallpaperAndTask() {

        val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)
@@ -2934,7 +2934,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    @Test

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,

    )

    fun handleRequest_closeTransition_singleTaskWithToken_withWallpaper_removesWallpaper() {

        val task = setUpFreeformTask()
@@ -2974,7 +2974,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    @Test

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,

    )

    fun handleRequest_closeTransition_multipleTasksSingleNonClosing_removesWallpaper() {

        val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)
@@ -2992,7 +2992,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    @Test

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,

    )

    fun handleRequest_closeTransition_multipleTasksSingleNonMinimized_removesWallpaper() {

        val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)
@@ -3084,7 +3084,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun moveFocusedTaskToFullscreen_onlyVisibleNonMinimizedTask_removesWallpaperActivity() {

        val task1 = setUpFreeformTask()

        val task2 = setUpFreeformTask()
@@ -3596,7 +3596,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun enterSplit_onlyVisibleNonMinimizedTask_removesWallpaperActivity() {

        val task1 = setUpFreeformTask()

        val task2 = setUpFreeformTask()

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksTransitionObserverTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ class DesktopTasksTransitionObserverTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_ON_SYSTEM_USER)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    fun closeLastTask_wallpaperTokenExists_wallpaperIsRemoved() {

        val mockTransition = Mockito.mock(IBinder::class.java)

        val task = createTaskInfo(1, WINDOWING_MODE_FREEFORM)