commit 95c9fcacde8c26d9907cd7c3d78b85c6e9874018
author Winson Chung <winsonc@google.com> Wed Jan 22 09:48:40 2020 -0800
committer Winson Chung <winsonc@google.com> Wed Jan 29 04:55:45 2020 +0000
tree bfd4c1204137093126050405f9a95ca0b90a17c5
parent 617b3b71da67b82244f5ba98ce4b27628213fc19

Minor refactoring to support moving code to shell

Bug: 148148105
Test: atest SystemUITests
Change-Id: I8614fe50cb87f66b1e403dfbfe8a68d1e043bd13

packages/SystemUI/src/com/android/systemui/Dependency.java

diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index aacc2c4..93b6a41 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -123,8 +123,8 @@
 import com.android.systemui.util.leak.LeakDetector;
 import com.android.systemui.util.leak.LeakReporter;
 import com.android.systemui.util.sensors.AsyncSensorManager;
+import com.android.systemui.wm.DisplayController;
 import com.android.systemui.wm.DisplayImeController;
-import com.android.systemui.wm.DisplayWindowController;
 import com.android.systemui.wm.SystemWindows;
 
 import java.io.FileDescriptor;
@@ -323,7 +323,7 @@
     @Inject Lazy<CommandQueue> mCommandQueue;
     @Inject Lazy<Recents> mRecents;
     @Inject Lazy<StatusBar> mStatusBar;
-    @Inject Lazy<DisplayWindowController> mDisplayWindowController;
+    @Inject Lazy<DisplayController> mDisplayController;
     @Inject Lazy<SystemWindows> mSystemWindows;
     @Inject Lazy<DisplayImeController> mDisplayImeController;
     @Inject Lazy<RecordingController> mRecordingController;
@@ -516,7 +516,7 @@
         mProviders.put(CommandQueue.class, mCommandQueue::get);
         mProviders.put(Recents.class, mRecents::get);
         mProviders.put(StatusBar.class, mStatusBar::get);
-        mProviders.put(DisplayWindowController.class, mDisplayWindowController::get);
+        mProviders.put(DisplayController.class, mDisplayController::get);
         mProviders.put(SystemWindows.class, mSystemWindows::get);
         mProviders.put(DisplayImeController.class, mDisplayImeController::get);