diff options
| author | Dave Mankoff <mankoff@google.com> | 2019-09-27 12:46:41 -0400 |
|---|---|---|
| committer | Dave Mankoff <mankoff@google.com> | 2019-10-07 11:05:40 -0400 |
| commit | 0cf8dfce9b311250577705da19e282c5054810a2 (patch) | |
| tree | 7d8d43d881c50c0c24ad3a7d0d3d2e0b7bb35201 /packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java | |
| parent | 8e73c69e916deecfa6209a8d05bea51a283353d9 (diff) | |
Create controller for StatusBarWindowView.
This moves most of the logic out of the view and into
StatusBarWindowViewController. It is not beautiful, but
it is cleaner than before.
This removes the final call to Dependency.get(FalsingManager.class).
This also fixes a small, old bug in
StatusBarWindowView.onInterceptTouchEvent where the results
of calling hte super method were being unintentionally ingored.
(This bug would have been introduced nearly seven years ago.)
Bug: 141751146,136279712
Test: atest SystemUITests
Change-Id: I5e09c1c0f2a3098db1a47837ddce3d382099f483
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java b/packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java index 72831e99e122..176bcbfd9500 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIDefaultModule.java @@ -19,8 +19,6 @@ package com.android.systemui; import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; import static com.android.systemui.Dependency.LEAK_REPORT_EMAIL_NAME; -import android.content.Context; - import androidx.annotation.Nullable; import com.android.systemui.dock.DockManager; @@ -72,11 +70,8 @@ abstract class SystemUIDefaultModule { abstract NotificationData.KeyguardEnvironment bindKeyguardEnvironment( KeyguardEnvironmentImpl keyguardEnvironment); - @Singleton - @Provides - static ShadeController provideShadeController(Context context) { - return SysUiServiceProvider.getComponent(context, StatusBar.class); - } + @Binds + abstract ShadeController provideShadeController(StatusBar statusBar); @Binds @IntoMap |