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

Commit 179aa5a2 authored by Winson Chung's avatar Winson Chung
Browse files

6/ Removing unused code from previous cleanup 

- No module overrides DisplayImeController now
- ShellController injects ShellInit & ShellCommandHandler now

Bug: 238217847
Test: atest WMShellUnitTests
Change-Id: I09ca0aa50e83fa9c4bfe203a0e17cb750d4a5a82
parent be8ad352

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

+0 −9
Original line number Diff line number Diff line
@@ -128,15 +128,9 @@ public abstract class WMShellBaseModule { 
                mainExecutor);

    }



    // Workaround for dynamic overriding with a default implementation, see {@link DynamicOverride}

    @BindsOptionalOf

    @DynamicOverride

    abstract DisplayImeController optionalDisplayImeController();



    @WMSingleton

    @Provides

    static DisplayImeController provideDisplayImeController(

            @DynamicOverride Optional<DisplayImeController> overrideDisplayImeController,

            IWindowManager wmService,

            ShellInit shellInit,

            DisplayController displayController,
@@ -144,9 +138,6 @@ public abstract class WMShellBaseModule { 
            TransactionPool transactionPool,

            @ShellMainThread ShellExecutor mainExecutor

    ) {

        if (overrideDisplayImeController.isPresent()) {

            return overrideDisplayImeController.get();

        }

        return new DisplayImeController(wmService, shellInit, displayController,

                displayInsetsController, transactionPool, mainExecutor);

    }

packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java

+0 −13
Original line number Diff line number Diff line
@@ -75,25 +75,12 @@ public interface WMComponent { 
     * Initializes all the WMShell components before starting any of the SystemUI components.

     */

    default void init() {

        // TODO(238217847): To be removed once the dependencies are inverted and ShellController can

        // inject these classes directly, otherwise, it's currently needed to ensure that these

        // classes are created and set on the controller before onInit() is called

        getShellInit();

        getShellCommandHandler();

        getShell().onInit();

    }



    @WMSingleton

    ShellInterface getShell();



    // TODO(238217847): To be removed once ShellController can inject ShellInit directly

    @WMSingleton

    ShellInit getShellInit();



    // TODO(238217847): To be removed once ShellController can inject ShellCommandHandler directly

    @WMSingleton

    ShellCommandHandler getShellCommandHandler();



    @WMSingleton

    Optional<OneHanded> getOneHanded();