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

Commit 1fc4cc2c authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Exclude nav bar area from apps bounds when in kids mode" into tm-dev am: bf8b8621 

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

Change-Id: I21a7efc0802c8947b2cabfc18a6cf0d5ec919a7b
parents 9c234560 bf8b8621

libs/WindowManager/Shell/src/com/android/wm/shell/ShellCommandHandlerImpl.java

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSIT 
import com.android.wm.shell.apppairs.AppPairsController;

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

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

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

import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController;

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

import com.android.wm.shell.pip.Pip;
@@ -46,11 +47,13 @@ public final class ShellCommandHandlerImpl { 
    private final Optional<AppPairsController> mAppPairsOptional;

    private final Optional<RecentTasksController> mRecentTasks;

    private final ShellTaskOrganizer mShellTaskOrganizer;

    private final KidsModeTaskOrganizer mKidsModeTaskOrganizer;

    private final ShellExecutor mMainExecutor;

    private final HandlerImpl mImpl = new HandlerImpl();



    public ShellCommandHandlerImpl(

            ShellTaskOrganizer shellTaskOrganizer,

            KidsModeTaskOrganizer kidsModeTaskOrganizer,

            Optional<LegacySplitScreenController> legacySplitScreenOptional,

            Optional<SplitScreenController> splitScreenOptional,

            Optional<Pip> pipOptional,
@@ -60,6 +63,7 @@ public final class ShellCommandHandlerImpl { 
            Optional<RecentTasksController> recentTasks,

            ShellExecutor mainExecutor) {

        mShellTaskOrganizer = shellTaskOrganizer;

        mKidsModeTaskOrganizer = kidsModeTaskOrganizer;

        mRecentTasks = recentTasks;

        mLegacySplitScreenOptional = legacySplitScreenOptional;

        mSplitScreenOptional = splitScreenOptional;
@@ -92,6 +96,9 @@ public final class ShellCommandHandlerImpl { 
        pw.println();

        pw.println();

        mRecentTasks.ifPresent(recentTasks -> recentTasks.dump(pw, ""));

        pw.println();

        pw.println();

        mKidsModeTaskOrganizer.dump(pw, "");

    }

libs/WindowManager/Shell/src/com/android/wm/shell/ShellInitImpl.java

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.wm.shell.draganddrop.DragAndDropController; 
import com.android.wm.shell.freeform.FreeformTaskListener;

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

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

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

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

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

import com.android.wm.shell.splitscreen.SplitScreenController;
@@ -48,6 +49,7 @@ public class ShellInitImpl { 
    private final DisplayInsetsController mDisplayInsetsController;

    private final DragAndDropController mDragAndDropController;

    private final ShellTaskOrganizer mShellTaskOrganizer;

    private final KidsModeTaskOrganizer mKidsModeTaskOrganizer;

    private final Optional<BubbleController> mBubblesOptional;

    private final Optional<SplitScreenController> mSplitScreenOptional;

    private final Optional<AppPairsController> mAppPairsOptional;
@@ -68,6 +70,7 @@ public class ShellInitImpl { 
            DisplayInsetsController displayInsetsController,

            DragAndDropController dragAndDropController,

            ShellTaskOrganizer shellTaskOrganizer,

            KidsModeTaskOrganizer kidsModeTaskOrganizer,

            Optional<BubbleController> bubblesOptional,

            Optional<SplitScreenController> splitScreenOptional,

            Optional<AppPairsController> appPairsOptional,
@@ -84,6 +87,7 @@ public class ShellInitImpl { 
        mDisplayInsetsController = displayInsetsController;

        mDragAndDropController = dragAndDropController;

        mShellTaskOrganizer = shellTaskOrganizer;

        mKidsModeTaskOrganizer = kidsModeTaskOrganizer;

        mBubblesOptional = bubblesOptional;

        mSplitScreenOptional = splitScreenOptional;

        mAppPairsOptional = appPairsOptional;
@@ -136,6 +140,9 @@ public class ShellInitImpl { 


        mFullscreenUnfoldController.ifPresent(FullscreenUnfoldController::init);

        mRecentTasks.ifPresent(RecentTasksController::init);



        // Initialize kids mode task organizer

        mKidsModeTaskOrganizer.initialize(mStartingWindow);

    }



    @ExternalThread

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java

+2 −2
Original line number Diff line number Diff line
@@ -196,8 +196,8 @@ public class ShellTaskOrganizer extends TaskOrganizer implements 
    }



    @VisibleForTesting

    ShellTaskOrganizer(ITaskOrganizerController taskOrganizerController, ShellExecutor mainExecutor,

            Context context, @Nullable CompatUIController compatUI,

    protected ShellTaskOrganizer(ITaskOrganizerController taskOrganizerController,

            ShellExecutor mainExecutor, Context context, @Nullable CompatUIController compatUI,

            Optional<RecentTasksController> recentTasks) {

        super(taskOrganizerController, mainExecutor);

        mCompatUI = compatUI;

libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java

+8 −0
Original line number Diff line number Diff line
@@ -109,6 +109,14 @@ public class DisplayController { 
        return r != null ? r.mContext : null;

    }



    /**

     *  Get the InsetsState of a display.

     */

    public InsetsState getInsetsState(int displayId) {

        final DisplayRecord r = mDisplays.get(displayId);

        return r != null ? r.mInsetsState : null;

    }



    /**

     * Updates the insets for a given display.

     */

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

+22 −2
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import com.android.wm.shell.fullscreen.FullscreenTaskListener; 
import com.android.wm.shell.fullscreen.FullscreenUnfoldController;

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

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

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

import com.android.wm.shell.legacysplitscreen.LegacySplitScreen;

import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController;

import com.android.wm.shell.onehanded.OneHanded;
@@ -184,7 +185,23 @@ public abstract class WMShellBaseModule { 


    @WMSingleton

    @Provides

    static Optional<CompatUI> provideCompatUI(CompatUIController compatUIController) {

    static KidsModeTaskOrganizer provideKidsModeTaskOrganizer(

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellMainThread Handler mainHandler,

            Context context,

            CompatUIController compatUI,

            SyncTransactionQueue syncTransactionQueue,

            DisplayController displayController,

            DisplayInsetsController displayInsetsController,

            Optional<RecentTasksController> recentTasksOptional

    ) {

        return new KidsModeTaskOrganizer(mainExecutor, mainHandler, context, compatUI,

                syncTransactionQueue, displayController, displayInsetsController,

                recentTasksOptional);

    }



    @WMSingleton

    @Provides static Optional<CompatUI> provideCompatUI(CompatUIController compatUIController) {

        return Optional.of(compatUIController.asCompatUI());

    }
@@ -637,6 +654,7 @@ public abstract class WMShellBaseModule { 
            DisplayInsetsController displayInsetsController,

            DragAndDropController dragAndDropController,

            ShellTaskOrganizer shellTaskOrganizer,

            KidsModeTaskOrganizer kidsModeTaskOrganizer,

            Optional<BubbleController> bubblesOptional,

            Optional<SplitScreenController> splitScreenOptional,

            Optional<AppPairsController> appPairsOptional,
@@ -653,6 +671,7 @@ public abstract class WMShellBaseModule { 
                displayInsetsController,

                dragAndDropController,

                shellTaskOrganizer,

                kidsModeTaskOrganizer,

                bubblesOptional,

                splitScreenOptional,

                appPairsOptional,
@@ -680,6 +699,7 @@ public abstract class WMShellBaseModule { 
    @Provides

    static ShellCommandHandlerImpl provideShellCommandHandlerImpl(

            ShellTaskOrganizer shellTaskOrganizer,

            KidsModeTaskOrganizer kidsModeTaskOrganizer,

            Optional<LegacySplitScreenController> legacySplitScreenOptional,

            Optional<SplitScreenController> splitScreenOptional,

            Optional<Pip> pipOptional,
@@ -688,7 +708,7 @@ public abstract class WMShellBaseModule { 
            Optional<AppPairsController> appPairsOptional,

            Optional<RecentTasksController> recentTasksOptional,

            @ShellMainThread ShellExecutor mainExecutor) {

        return new ShellCommandHandlerImpl(shellTaskOrganizer,

        return new ShellCommandHandlerImpl(shellTaskOrganizer, kidsModeTaskOrganizer,

                legacySplitScreenOptional, splitScreenOptional, pipOptional, oneHandedOptional,

                hideDisplayCutout, appPairsOptional, recentTasksOptional, mainExecutor);

    }