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

Commit 7ca82303 authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "[Dev options][Wallpaper flag] Update all usage of... 

Merge "[Dev options][Wallpaper flag] Update all usage of enableDesktopWindowingWallpaperActivity flag to use DesktopModeFlags" into main
parents ad07aef2 bcf873c3

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

+3 −2
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import com.android.wm.shell.common.RemoteCallable 
import com.android.wm.shell.common.ShellExecutor

import com.android.wm.shell.common.SingleInstanceRemoteListener

import com.android.wm.shell.common.SyncTransactionQueue

import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY

import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource

import com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT

import com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_TOP_OR_LEFT
@@ -786,7 +787,7 @@ class DesktopTasksController( 
        moveHomeTask(wct, toTop = true)



        // Currently, we only handle the desktop on the default display really.

        if (displayId == DEFAULT_DISPLAY && Flags.enableDesktopWindowingWallpaperActivity()) {

        if (displayId == DEFAULT_DISPLAY && WALLPAPER_ACTIVITY.isEnabled(context)) {

            // Add translucent wallpaper activity to show the wallpaper underneath

            addWallpaperActivity(wct)

        }
@@ -974,7 +975,7 @@ class DesktopTasksController( 
                && isTopActivityExemptFromDesktopWindowing(context, task)



    private fun shouldHandleTaskClosing(request: TransitionRequestInfo): Boolean {

        return Flags.enableDesktopWindowingWallpaperActivity() &&

        return WALLPAPER_ACTIVITY.isEnabled(context) &&

            TransitionUtil.isClosingType(request.type) &&

            request.triggerTask != null

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ import android.view.WindowManager 
import android.window.TransitionInfo

import android.window.WindowContainerTransaction

import com.android.internal.protolog.ProtoLog

import com.android.window.flags.Flags.enableDesktopWindowingWallpaperActivity

import com.android.wm.shell.ShellTaskOrganizer

import com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE

import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus

import com.android.wm.shell.sysui.ShellInit

import com.android.wm.shell.transition.Transitions
@@ -36,7 +36,7 @@ import com.android.wm.shell.transition.Transitions 
 * mode and other transitions that originate both within and outside shell.

 */

class DesktopTasksTransitionObserver(

    context: Context,

    private val context: Context,

    private val desktopModeTaskRepository: DesktopModeTaskRepository,

    private val transitions: Transitions,

    private val shellTaskOrganizer: ShellTaskOrganizer,
@@ -79,7 +79,7 @@ class DesktopTasksTransitionObserver( 
    }



    private fun updateWallpaperToken(info: TransitionInfo) {

        if (!enableDesktopWindowingWallpaperActivity()) {

        if (!WALLPAPER_ACTIVITY.isEnabled(context)) {

            return

        }

        info.changes.forEach { change ->