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

Commit b6c7d1c8 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Move kids task organizer to handheld package" into tm-qpr-dev am: da1e890f 

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



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

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

+0 −21
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ import com.android.wm.shell.floating.FloatingTasksController; 
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.kidsmode.KidsModeTaskOrganizer;

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

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

import com.android.wm.shell.pip.Pip;
@@ -190,25 +189,6 @@ public abstract class WMShellBaseModule { 
                unfoldAnimationController, recentTasksOptional, mainExecutor);

    }



    @WMSingleton

    @Provides

    static KidsModeTaskOrganizer provideKidsModeTaskOrganizer(

            Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            SyncTransactionQueue syncTransactionQueue,

            DisplayController displayController,

            DisplayInsetsController displayInsetsController,

            Optional<UnfoldAnimationController> unfoldAnimationController,

            Optional<RecentTasksController> recentTasksOptional,

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellMainThread Handler mainHandler

    ) {

        return new KidsModeTaskOrganizer(context, shellInit, shellCommandHandler,

                syncTransactionQueue, displayController, displayInsetsController,

                unfoldAnimationController, recentTasksOptional, mainExecutor, mainHandler);

    }



    @WMSingleton

    @Provides

    static CompatUIController provideCompatUIController(Context context,
@@ -781,7 +761,6 @@ public abstract class WMShellBaseModule { 
            DisplayInsetsController displayInsetsController,

            DragAndDropController dragAndDropController,

            ShellTaskOrganizer shellTaskOrganizer,

            KidsModeTaskOrganizer kidsModeTaskOrganizer,

            Optional<BubbleController> bubblesOptional,

            Optional<SplitScreenController> splitScreenOptional,

            Optional<Pip> pipOptional,

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

+24 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.wm.shell.freeform.FreeformTaskListener; 
import com.android.wm.shell.freeform.FreeformTaskTransitionHandler;

import com.android.wm.shell.freeform.FreeformTaskTransitionObserver;

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

import com.android.wm.shell.kidsmode.KidsModeTaskOrganizer;

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

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

import com.android.wm.shell.pip.PipAnimationController;
@@ -619,6 +620,28 @@ public abstract class WMShellModule { 
        return new DesktopModeTaskRepository();

    }



    //

    // Kids mode

    //

    @WMSingleton

    @Provides

    static KidsModeTaskOrganizer provideKidsModeTaskOrganizer(

            Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            SyncTransactionQueue syncTransactionQueue,

            DisplayController displayController,

            DisplayInsetsController displayInsetsController,

            Optional<UnfoldAnimationController> unfoldAnimationController,

            Optional<RecentTasksController> recentTasksOptional,

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellMainThread Handler mainHandler

    ) {

        return new KidsModeTaskOrganizer(context, shellInit, shellCommandHandler,

                syncTransactionQueue, displayController, displayInsetsController,

                unfoldAnimationController, recentTasksOptional, mainExecutor, mainHandler);

    }



    //

    // Misc

    //
@@ -630,6 +653,7 @@ public abstract class WMShellModule { 
    @Provides

    static Object provideIndependentShellComponentsToCreate(

            DefaultMixedHandler defaultMixedHandler,

            KidsModeTaskOrganizer kidsModeTaskOrganizer,

            Optional<DesktopModeController> desktopModeController) {

        return new Object();

    }