Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "6/ Removing unused code from previous cleanup" into tm-qpr-dev am: f1318aa342

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

Change-Id: I9cfd65478eb80b25b94b555bfa3172a7ceeae5ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-08-10 17:43:38 +00:00
committed by Automerger Merge Worker
parent 4bcb7914b8 f1318aa342
commit a77719c146
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,15 +128,9 @@ public abstract class WMShellBaseModule {
mainExecutor); mainExecutor);
} }
// Workaround for dynamic overriding with a default implementation, see {@link DynamicOverride}
@BindsOptionalOf
@DynamicOverride
abstract DisplayImeController optionalDisplayImeController();
@WMSingleton @WMSingleton
@Provides @Provides
static DisplayImeController provideDisplayImeController( static DisplayImeController provideDisplayImeController(
@DynamicOverride Optional<DisplayImeController> overrideDisplayImeController,
IWindowManager wmService, IWindowManager wmService,
ShellInit shellInit, ShellInit shellInit,
DisplayController displayController, DisplayController displayController,
@@ -144,9 +138,6 @@ public abstract class WMShellBaseModule {
TransactionPool transactionPool, TransactionPool transactionPool,
@ShellMainThread ShellExecutor mainExecutor @ShellMainThread ShellExecutor mainExecutor
) { ) {
if (overrideDisplayImeController.isPresent()) {
return overrideDisplayImeController.get();
}
return new DisplayImeController(wmService, shellInit, displayController, return new DisplayImeController(wmService, shellInit, displayController,
displayInsetsController, transactionPool, mainExecutor); displayInsetsController, transactionPool, mainExecutor);
} }

13
packages/SystemUI/src/com/android/systemui/dagger/WMComponent.java
View File

@@ -75,25 +75,12 @@ public interface WMComponent {
* Initializes all the WMShell components before starting any of the SystemUI components. * Initializes all the WMShell components before starting any of the SystemUI components.
*/ */
default void init() { 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(); getShell().onInit();
} }
@WMSingleton @WMSingleton
ShellInterface getShell(); 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 @WMSingleton
Optional<OneHanded> getOneHanded(); Optional<OneHanded> getOneHanded();