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

Commit 8db28669 authored by Ats Jenk's avatar Ats Jenk Committed by Automerger Merge Worker
Browse files

Merge changes If5199a8e,I2c0a63d9 into udc-qpr-dev am: be70a74c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23480148



Change-Id: Id38bce52c02e5bf9b016a4a1f1dba4a9840cf8ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba0aa425 be70a74c

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+1 −1
Original line number Diff line number Diff line
@@ -2152,7 +2152,7 @@ public class BubbleController implements ConfigurationChangeListener, 
                    pw.println("   suppressing: " + key);

                }



                pw.print("mAppBubbleTaskIds: " + mAppBubbleTaskIds.values());

                pw.println("mAppBubbleTaskIds: " + mAppBubbleTaskIds.values());

            }

        }

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvWMShellModule.java

+4 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.wm.shell.ShellTaskOrganizer; 
import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayImeController;

import com.android.wm.shell.common.DisplayInsetsController;

import com.android.wm.shell.common.LaunchAdjacentController;

import com.android.wm.shell.common.ShellExecutor;

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

import com.android.wm.shell.common.SystemWindows;
@@ -86,13 +87,14 @@ public class TvWMShellModule { 
            TransactionPool transactionPool,

            IconProvider iconProvider,

            Optional<RecentTasksController> recentTasks,

            LaunchAdjacentController launchAdjacentController,

            @ShellMainThread ShellExecutor mainExecutor,

            Handler mainHandler,

            SystemWindows systemWindows) {

        return new TvSplitScreenController(context, shellInit, shellCommandHandler, shellController,

                shellTaskOrganizer, syncQueue, rootTDAOrganizer, displayController,

                displayImeController, displayInsetsController, dragAndDropController, transitions,

                transactionPool, iconProvider, recentTasks, mainExecutor, mainHandler,

                systemWindows);

                transactionPool, iconProvider, recentTasks, launchAdjacentController, mainExecutor,

                mainHandler, systemWindows);

    }

}

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

+10 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.wm.shell.common.DisplayInsetsController; 
import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.DockStateReader;

import com.android.wm.shell.common.FloatingContentCoordinator;

import com.android.wm.shell.common.LaunchAdjacentController;

import com.android.wm.shell.common.ShellExecutor;

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

import com.android.wm.shell.common.SystemWindows;
@@ -70,6 +71,8 @@ import com.android.wm.shell.draganddrop.DragAndDropController; 
import com.android.wm.shell.freeform.FreeformComponents;

import com.android.wm.shell.fullscreen.FullscreenTaskListener;

import com.android.wm.shell.hidedisplaycutout.HideDisplayCutoutController;

import com.android.wm.shell.keyguard.KeyguardTransitionHandler;

import com.android.wm.shell.keyguard.KeyguardTransitions;

import com.android.wm.shell.onehanded.OneHanded;

import com.android.wm.shell.onehanded.OneHandedController;

import com.android.wm.shell.pip.Pip;
@@ -77,8 +80,6 @@ import com.android.wm.shell.pip.PipMediaController; 
import com.android.wm.shell.pip.PipSurfaceTransactionHelper;

import com.android.wm.shell.pip.PipUiEventLogger;

import com.android.wm.shell.pip.phone.PipTouchHandler;

import com.android.wm.shell.keyguard.KeyguardTransitionHandler;

import com.android.wm.shell.keyguard.KeyguardTransitions;

import com.android.wm.shell.recents.RecentTasks;

import com.android.wm.shell.recents.RecentTasksController;

import com.android.wm.shell.recents.RecentsTransitionHandler;
@@ -275,6 +276,13 @@ public abstract class WMShellBaseModule { 
        return new WindowManagerShellWrapper(mainExecutor);

    }



    @WMSingleton

    @Provides

    static LaunchAdjacentController provideLaunchAdjacentController(

            SyncTransactionQueue syncQueue) {

        return new LaunchAdjacentController(syncQueue);

    }



    //

    // Back animation

    //

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+9 −5
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.wm.shell.common.DisplayImeController; 
import com.android.wm.shell.common.DisplayInsetsController;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.FloatingContentCoordinator;

import com.android.wm.shell.common.LaunchAdjacentController;

import com.android.wm.shell.common.ShellExecutor;

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

import com.android.wm.shell.common.SystemWindows;
@@ -334,11 +335,12 @@ public abstract class WMShellModule { 
            TransactionPool transactionPool,

            IconProvider iconProvider,

            Optional<RecentTasksController> recentTasks,

            LaunchAdjacentController launchAdjacentController,

            @ShellMainThread ShellExecutor mainExecutor) {

        return new SplitScreenController(context, shellInit, shellCommandHandler, shellController,

                shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer, displayController,

                displayImeController, displayInsetsController, dragAndDropController, transitions,

                transactionPool, iconProvider, recentTasks, mainExecutor);

                transactionPool, iconProvider, recentTasks, launchAdjacentController, mainExecutor);

    }



    //
@@ -679,6 +681,7 @@ public abstract class WMShellModule { 
    static DesktopTasksController provideDesktopTasksController(

            Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellController shellController,

            DisplayController displayController,

            ShellTaskOrganizer shellTaskOrganizer,
@@ -688,12 +691,13 @@ public abstract class WMShellModule { 
            EnterDesktopTaskTransitionHandler enterDesktopTransitionHandler,

            ExitDesktopTaskTransitionHandler exitDesktopTransitionHandler,

            @DynamicOverride DesktopModeTaskRepository desktopModeTaskRepository,

            LaunchAdjacentController launchAdjacentController,

            @ShellMainThread ShellExecutor mainExecutor

    ) {

        return new DesktopTasksController(context, shellInit, shellController, displayController,

                shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer, transitions,

                enterDesktopTransitionHandler, exitDesktopTransitionHandler,

                desktopModeTaskRepository, mainExecutor);

        return new DesktopTasksController(context, shellInit, shellCommandHandler, shellController,

                displayController, shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer,

                transitions, enterDesktopTransitionHandler, exitDesktopTransitionHandler,

                desktopModeTaskRepository, launchAdjacentController, mainExecutor);

    }



    @WMSingleton

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

+24 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.core.util.keyIterator 
import androidx.core.util.valueIterator

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

import com.android.wm.shell.util.KtProtoLog

import java.io.PrintWriter

import java.util.concurrent.Executor

import java.util.function.Consumer
@@ -339,6 +340,25 @@ class DesktopModeTaskRepository { 
        return displayData[displayId]?.stashed ?: false

    }



    internal fun dump(pw: PrintWriter, prefix: String) {

        val innerPrefix = "$prefix  "

        pw.println("${prefix}DesktopModeTaskRepository")

        dumpDisplayData(pw, innerPrefix)

        pw.println("${innerPrefix}freeformTasksInZOrder=${freeformTasksInZOrder.toDumpString()}")

        pw.println("${innerPrefix}activeTasksListeners=${activeTasksListeners.size}")

        pw.println("${innerPrefix}visibleTasksListeners=${visibleTasksListeners.size}")

    }



    private fun dumpDisplayData(pw: PrintWriter, prefix: String) {

        val innerPrefix = "$prefix  "

        displayData.forEach { displayId, data ->

            pw.println("${prefix}Display $displayId:")

            pw.println("${innerPrefix}activeTasks=${data.activeTasks.toDumpString()}")

            pw.println("${innerPrefix}visibleTasks=${data.visibleTasks.toDumpString()}")

            pw.println("${innerPrefix}stashed=${data.stashed}")

        }

    }



    /**

     * Defines interface for classes that can listen to changes for active tasks in desktop mode.

     */
@@ -367,3 +387,7 @@ class DesktopModeTaskRepository { 
        fun onStashedChanged(displayId: Int, stashed: Boolean) {}

    }

}



private fun <T> Iterable<T>.toDumpString(): String {

    return joinToString(separator = ", ", prefix = "[", postfix = "]")

}
 
 No newline at end of file