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

Commit be8ad352 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes from topic "shell_command_handler" into tm-qpr-dev 

* changes:
  5/ Fix inverted dependency for ShellCommandHandler
  4/ Separate construction and initializing in a few more controllers
parents a2c8daf7 38caa7a7

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

+12 −4
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.wm.shell.common.ShellExecutor; 
import com.android.wm.shell.compatui.CompatUIController;

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

import com.android.wm.shell.startingsurface.StartingWindowController;

import com.android.wm.shell.sysui.ShellCommandHandler;

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

import com.android.wm.shell.unfold.UnfoldAnimationController;
@@ -72,6 +73,7 @@ import java.util.function.Consumer; 
 */

public class ShellTaskOrganizer extends TaskOrganizer implements

        CompatUIController.CompatUICallback {

    private static final String TAG = "ShellTaskOrganizer";



    // Intentionally using negative numbers here so the positive numbers can be used

    // for task id specific listeners that will be added later.
@@ -90,8 +92,6 @@ public class ShellTaskOrganizer extends TaskOrganizer implements 
    })

    public @interface TaskListenerType {}



    private static final String TAG = "ShellTaskOrganizer";



    /**

     * Callbacks for when the tasks change in the system.

     */
@@ -177,6 +177,9 @@ public class ShellTaskOrganizer extends TaskOrganizer implements 
    @Nullable

    private final CompatUIController mCompatUI;



    @NonNull

    private final ShellCommandHandler mShellCommandHandler;



    @Nullable

    private final Optional<RecentTasksController> mRecentTasks;
@@ -187,29 +190,33 @@ public class ShellTaskOrganizer extends TaskOrganizer implements 
    private RunningTaskInfo mLastFocusedTaskInfo;



    public ShellTaskOrganizer(ShellExecutor mainExecutor) {

        this(null /* shellInit */, null /* taskOrganizerController */, null /* compatUI */,

        this(null /* shellInit */, null /* shellCommandHandler */,

                null /* taskOrganizerController */, null /* compatUI */,

                Optional.empty() /* unfoldAnimationController */,

                Optional.empty() /* recentTasksController */,

                mainExecutor);

    }



    public ShellTaskOrganizer(ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            @Nullable CompatUIController compatUI,

            Optional<UnfoldAnimationController> unfoldAnimationController,

            Optional<RecentTasksController> recentTasks,

            ShellExecutor mainExecutor) {

        this(shellInit, null /* taskOrganizerController */, compatUI,

        this(shellInit, shellCommandHandler, null /* taskOrganizerController */, compatUI,

                unfoldAnimationController, recentTasks, mainExecutor);

    }



    @VisibleForTesting

    protected ShellTaskOrganizer(ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ITaskOrganizerController taskOrganizerController,

            @Nullable CompatUIController compatUI,

            Optional<UnfoldAnimationController> unfoldAnimationController,

            Optional<RecentTasksController> recentTasks,

            ShellExecutor mainExecutor) {

        super(taskOrganizerController, mainExecutor);

        mShellCommandHandler = shellCommandHandler;

        mCompatUI = compatUI;

        mRecentTasks = recentTasks;

        mUnfoldAnimationController = unfoldAnimationController.orElse(null);
@@ -219,6 +226,7 @@ public class ShellTaskOrganizer extends TaskOrganizer implements 
    }



    private void onInit() {

        mShellCommandHandler.addDumpCallback(this::dump, this);

        if (mCompatUI != null) {

            mCompatUI.setCompatUICallback(this);

        }

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+17 −5
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.wm.shell.common.RemoteCallable; 
import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.annotations.ShellBackgroundThread;

import com.android.wm.shell.common.annotations.ShellMainThread;

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



import java.util.concurrent.atomic.AtomicBoolean;
@@ -90,7 +91,6 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
     * Raw delta between {@link #mInitTouchLocation} and the last touch location.

     */

    private final Point mTouchEventDelta = new Point();

    private final ShellExecutor mShellExecutor;



    /** True when a back gesture is ongoing */

    private boolean mBackGestureStarted = false;
@@ -105,6 +105,9 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
    private final SurfaceControl.Transaction mTransaction;

    private final IActivityTaskManager mActivityTaskManager;

    private final Context mContext;

    private final ContentResolver mContentResolver;

    private final ShellExecutor mShellExecutor;

    private final Handler mBgHandler;

    @Nullable

    private IOnBackInvokedCallback mBackToLauncherCallback;

    private float mTriggerThreshold;
@@ -133,16 +136,19 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
    };



    public BackAnimationController(

            @NonNull ShellInit shellInit,

            @NonNull @ShellMainThread ShellExecutor shellExecutor,

            @NonNull @ShellBackgroundThread Handler backgroundHandler,

            Context context) {

        this(shellExecutor, backgroundHandler, new SurfaceControl.Transaction(),

        this(shellInit, shellExecutor, backgroundHandler, new SurfaceControl.Transaction(),

                ActivityTaskManager.getService(), context, context.getContentResolver());

    }



    @VisibleForTesting

    BackAnimationController(@NonNull @ShellMainThread ShellExecutor shellExecutor,

            @NonNull @ShellBackgroundThread Handler handler,

    BackAnimationController(

            @NonNull ShellInit shellInit,

            @NonNull @ShellMainThread ShellExecutor shellExecutor,

            @NonNull @ShellBackgroundThread Handler bgHandler,

            @NonNull SurfaceControl.Transaction transaction,

            @NonNull IActivityTaskManager activityTaskManager,

            Context context, ContentResolver contentResolver) {
@@ -150,7 +156,13 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
        mTransaction = transaction;

        mActivityTaskManager = activityTaskManager;

        mContext = context;

        setupAnimationDeveloperSettingsObserver(contentResolver, handler);

        mContentResolver = contentResolver;

        mBgHandler = bgHandler;

        shellInit.addInitCallback(this::onInit, this);

    }



    private void onInit() {

        setupAnimationDeveloperSettingsObserver(mContentResolver, mBgHandler);

    }



    private void setupAnimationDeveloperSettingsObserver(

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java

+8 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.wm.shell.compatui.CompatUIWindowManager.CompatUIHintsState; 
import com.android.wm.shell.compatui.letterboxedu.LetterboxEduWindowManager;

import com.android.wm.shell.sysui.KeyguardChangeListener;

import com.android.wm.shell.sysui.ShellController;

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

import com.android.wm.shell.transition.Transitions;



import java.lang.ref.WeakReference;
@@ -119,6 +120,7 @@ public class CompatUIController implements OnDisplaysChangedListener, 
    private boolean mKeyguardShowing;



    public CompatUIController(Context context,

            ShellInit shellInit,

            ShellController shellController,

            DisplayController displayController,

            DisplayInsetsController displayInsetsController,
@@ -134,10 +136,14 @@ public class CompatUIController implements OnDisplaysChangedListener, 
        mSyncQueue = syncQueue;

        mMainExecutor = mainExecutor;

        mTransitionsLazy = transitionsLazy;

        mCompatUIHintsState = new CompatUIHintsState();

        shellInit.addInitCallback(this::onInit, this);

    }



    private void onInit() {

        mShellController.addKeyguardChangeListener(this);

        mDisplayController.addDisplayWindowListener(this);

        mImeController.addPositionProcessor(this);

        mCompatUIHintsState = new CompatUIHintsState();

        shellController.addKeyguardChangeListener(this);

    }



    /** Sets the callback for UI interactions. */

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

+28 −26
Original line number Diff line number Diff line
@@ -174,13 +174,14 @@ public abstract class WMShellBaseModule { 
    @Provides

    static ShellTaskOrganizer provideShellTaskOrganizer(

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            CompatUIController compatUI,

            Optional<UnfoldAnimationController> unfoldAnimationController,

            Optional<RecentTasksController> recentTasksOptional,

            @ShellMainThread ShellExecutor mainExecutor

    ) {

        return new ShellTaskOrganizer(shellInit, compatUI, unfoldAnimationController,

                recentTasksOptional, mainExecutor);

        return new ShellTaskOrganizer(shellInit, shellCommandHandler, compatUI,

                unfoldAnimationController, recentTasksOptional, mainExecutor);

    }



    @WMSingleton
@@ -188,6 +189,7 @@ public abstract class WMShellBaseModule { 
    static KidsModeTaskOrganizer provideKidsModeTaskOrganizer(

            Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            SyncTransactionQueue syncTransactionQueue,

            DisplayController displayController,

            DisplayInsetsController displayInsetsController,
@@ -196,19 +198,20 @@ public abstract class WMShellBaseModule { 
            @ShellMainThread ShellExecutor mainExecutor,

            @ShellMainThread Handler mainHandler

    ) {

        return new KidsModeTaskOrganizer(context, shellInit, syncTransactionQueue,

                displayController, displayInsetsController, unfoldAnimationController,

                recentTasksOptional, mainExecutor, mainHandler);

        return new KidsModeTaskOrganizer(context, shellInit, shellCommandHandler,

                syncTransactionQueue, displayController, displayInsetsController,

                unfoldAnimationController, recentTasksOptional, mainExecutor, mainHandler);

    }



    @WMSingleton

    @Provides

    static CompatUIController provideCompatUIController(Context context,

            ShellInit shellInit,

            ShellController shellController,

            DisplayController displayController, DisplayInsetsController displayInsetsController,

            DisplayImeController imeController, SyncTransactionQueue syncQueue,

            @ShellMainThread ShellExecutor mainExecutor, Lazy<Transitions> transitionsLazy) {

        return new CompatUIController(context, shellController, displayController,

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

                displayInsetsController, imeController, syncQueue, mainExecutor, transitionsLazy);

    }
@@ -268,12 +271,14 @@ public abstract class WMShellBaseModule { 
    @Provides

    static Optional<BackAnimationController> provideBackAnimationController(

            Context context,

            ShellInit shellInit,

            @ShellMainThread ShellExecutor shellExecutor,

            @ShellBackgroundThread Handler backgroundHandler

    ) {

        if (BackAnimationController.IS_ENABLED) {

            return Optional.of(

                    new BackAnimationController(shellExecutor, backgroundHandler, context));

                    new BackAnimationController(shellInit, shellExecutor, backgroundHandler,

                            context));

        }

        return Optional.empty();

    }
@@ -384,11 +389,14 @@ public abstract class WMShellBaseModule { 
    @WMSingleton

    @Provides

    static Optional<HideDisplayCutoutController> provideHideDisplayCutoutController(Context context,

            ShellController shellController, DisplayController displayController,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellController shellController,

            DisplayController displayController,

            @ShellMainThread ShellExecutor mainExecutor) {

        return Optional.ofNullable(

                HideDisplayCutoutController.create(context, shellController, displayController,

                        mainExecutor));

                HideDisplayCutoutController.create(context, shellInit, shellCommandHandler,

                        shellController, displayController, mainExecutor));

    }



    //
@@ -466,12 +474,13 @@ public abstract class WMShellBaseModule { 
    static Optional<RecentTasksController> provideRecentTasksController(

            Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            TaskStackListenerImpl taskStackListener,

            @ShellMainThread ShellExecutor mainExecutor

    ) {

        return Optional.ofNullable(

                RecentTasksController.create(context, shellInit, taskStackListener,

                        mainExecutor));

                RecentTasksController.create(context, shellInit, shellCommandHandler,

                        taskStackListener, mainExecutor));

    }



    //
@@ -649,8 +658,9 @@ public abstract class WMShellBaseModule { 
    @WMSingleton

    @Provides

    static ShellController provideShellController(ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            @ShellMainThread ShellExecutor mainExecutor) {

        return new ShellController(shellInit, mainExecutor);

        return new ShellController(shellInit, shellCommandHandler, mainExecutor);

    }



    //
@@ -676,12 +686,15 @@ public abstract class WMShellBaseModule { 
            KidsModeTaskOrganizer kidsModeTaskOrganizer,

            Optional<BubbleController> bubblesOptional,

            Optional<SplitScreenController> splitScreenOptional,

            Optional<Pip> pipOptional,

            Optional<PipTouchHandler> pipTouchHandlerOptional,

            FullscreenTaskListener fullscreenTaskListener,

            Optional<UnfoldAnimationController> unfoldAnimationController,

            Optional<UnfoldTransitionHandler> unfoldTransitionHandler,

            Optional<FreeformComponents> freeformComponents,

            Optional<RecentTasksController> recentTasksOptional,

            Optional<OneHandedController> oneHandedControllerOptional,

            Optional<HideDisplayCutoutController> hideDisplayCutoutControllerOptional,

            ActivityEmbeddingController activityEmbeddingOptional,

            Transitions transitions,

            StartingWindowController startingWindow,
@@ -697,18 +710,7 @@ public abstract class WMShellBaseModule { 


    @WMSingleton

    @Provides

    static ShellCommandHandler provideShellCommandHandlerImpl(

            ShellController shellController,

            ShellTaskOrganizer shellTaskOrganizer,

            KidsModeTaskOrganizer kidsModeTaskOrganizer,

            Optional<SplitScreenController> splitScreenOptional,

            Optional<Pip> pipOptional,

            Optional<OneHandedController> oneHandedOptional,

            Optional<HideDisplayCutoutController> hideDisplayCutout,

            Optional<RecentTasksController> recentTasksOptional,

            @ShellMainThread ShellExecutor mainExecutor) {

        return new ShellCommandHandler(shellController, shellTaskOrganizer,

                kidsModeTaskOrganizer, splitScreenOptional, pipOptional, oneHandedOptional,

                hideDisplayCutout, recentTasksOptional, mainExecutor);

    static ShellCommandHandler provideShellCommandHandler() {

        return new ShellCommandHandler();

    }

}

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

+40 −23
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import com.android.wm.shell.pip.phone.PipMotionHelper; 
import com.android.wm.shell.pip.phone.PipTouchHandler;

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

import com.android.wm.shell.splitscreen.SplitScreenController;

import com.android.wm.shell.sysui.ShellCommandHandler;

import com.android.wm.shell.sysui.ShellController;

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

import com.android.wm.shell.transition.SplitscreenPipMixedHandler;
@@ -248,14 +249,20 @@ public abstract class WMShellModule { 
    @Provides

    @DynamicOverride

    static OneHandedController provideOneHandedController(Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellController shellController,

            WindowManager windowManager, DisplayController displayController,

            DisplayLayout displayLayout, TaskStackListenerImpl taskStackListener,

            UiEventLogger uiEventLogger, InteractionJankMonitor jankMonitor,

            @ShellMainThread ShellExecutor mainExecutor, @ShellMainThread Handler mainHandler) {

        return OneHandedController.create(context, shellController, windowManager,

                displayController, displayLayout, taskStackListener, jankMonitor, uiEventLogger,

                mainExecutor, mainHandler);

            WindowManager windowManager,

            DisplayController displayController,

            DisplayLayout displayLayout,

            TaskStackListenerImpl taskStackListener,

            UiEventLogger uiEventLogger,

            InteractionJankMonitor jankMonitor,

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellMainThread Handler mainHandler) {

        return OneHandedController.create(context, shellInit, shellCommandHandler, shellController,

                windowManager, displayController, displayLayout, taskStackListener, jankMonitor,

                uiEventLogger, mainExecutor, mainHandler);

    }



    //
@@ -268,6 +275,7 @@ public abstract class WMShellModule { 
    static SplitScreenController provideSplitScreenController(

            Context context,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellController shellController,

            ShellTaskOrganizer shellTaskOrganizer,

            SyncTransactionQueue syncQueue,
@@ -281,10 +289,10 @@ public abstract class WMShellModule { 
            IconProvider iconProvider,

            Optional<RecentTasksController> recentTasks,

            @ShellMainThread ShellExecutor mainExecutor) {

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

                syncQueue, rootTaskDisplayAreaOrganizer, displayController, displayImeController,

                displayInsetsController, dragAndDropController, transitions, transactionPool,

                iconProvider, recentTasks, mainExecutor);

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

                shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer, displayController,

                displayImeController, displayInsetsController, dragAndDropController, transitions,

                transactionPool, iconProvider, recentTasks, mainExecutor);

    }



    //
@@ -294,24 +302,33 @@ public abstract class WMShellModule { 
    @WMSingleton

    @Provides

    static Optional<Pip> providePip(Context context,

            ShellController shellController, DisplayController displayController,

            PipAppOpsListener pipAppOpsListener, PipBoundsAlgorithm pipBoundsAlgorithm,

            PipKeepClearAlgorithm pipKeepClearAlgorithm, PipBoundsState pipBoundsState,

            PipMotionHelper pipMotionHelper, PipMediaController pipMediaController,

            PhonePipMenuController phonePipMenuController, PipTaskOrganizer pipTaskOrganizer,

            ShellInit shellInit,

            ShellCommandHandler shellCommandHandler,

            ShellController shellController,

            DisplayController displayController,

            PipAppOpsListener pipAppOpsListener,

            PipBoundsAlgorithm pipBoundsAlgorithm,

            PipKeepClearAlgorithm pipKeepClearAlgorithm,

            PipBoundsState pipBoundsState,

            PipMotionHelper pipMotionHelper,

            PipMediaController pipMediaController,

            PhonePipMenuController phonePipMenuController,

            PipTaskOrganizer pipTaskOrganizer,

            PipTransitionState pipTransitionState,

            PipTouchHandler pipTouchHandler, PipTransitionController pipTransitionController,

            PipTouchHandler pipTouchHandler,

            PipTransitionController pipTransitionController,

            WindowManagerShellWrapper windowManagerShellWrapper,

            TaskStackListenerImpl taskStackListener,

            PipParamsChangedForwarder pipParamsChangedForwarder,

            Optional<OneHandedController> oneHandedController,

            @ShellMainThread ShellExecutor mainExecutor) {

        return Optional.ofNullable(PipController.create(context, shellController, displayController,

                pipAppOpsListener, pipBoundsAlgorithm, pipKeepClearAlgorithm, pipBoundsState,

                pipMotionHelper,

                pipMediaController, phonePipMenuController, pipTaskOrganizer, pipTransitionState,

                pipTouchHandler, pipTransitionController, windowManagerShellWrapper,

                taskStackListener, pipParamsChangedForwarder, oneHandedController, mainExecutor));

        return Optional.ofNullable(PipController.create(

                context, shellInit, shellCommandHandler, shellController,

                displayController, pipAppOpsListener, pipBoundsAlgorithm, pipKeepClearAlgorithm,

                pipBoundsState, pipMotionHelper, pipMediaController, phonePipMenuController,

                pipTaskOrganizer, pipTransitionState, pipTouchHandler, pipTransitionController,

                windowManagerShellWrapper, taskStackListener, pipParamsChangedForwarder,

                oneHandedController, mainExecutor));

    }



    @WMSingleton