diff options
5 files changed, 36 insertions, 6 deletions
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 678f8acad0e6..5195f1a22b67 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.car; import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; +import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -30,6 +31,7 @@ import android.content.Context; import android.content.res.Configuration; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Handler; import android.os.PowerManager; import android.util.DisplayMetrics; import android.util.Log; @@ -75,6 +77,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.navigationbar.car.CarNavigationBarController; +import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.qs.QS; import com.android.systemui.qs.car.CarQSFragment; @@ -321,6 +324,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt StatusBarKeyguardViewManager statusBarKeyguardViewManager, ViewMediatorCallback viewMediatorCallback, InitController initController, + DarkIconDispatcher darkIconDispatcher, + @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler, DismissCallbackRegistry dismissCallbackRegistry, /* Car Settings injected components. */ CarServiceProvider carServiceProvider, @@ -402,6 +407,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt statusBarKeyguardViewManager, viewMediatorCallback, initController, + darkIconDispatcher, + timeTickHandler, dismissCallbackRegistry); mScrimController = scrimController; mLockscreenLockIconController = lockscreenLockIconController; diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java index 640aeb701fe5..b4323cc86424 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java @@ -17,8 +17,10 @@ package com.android.systemui.statusbar.car; import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; +import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME; import android.content.Context; +import android.os.Handler; import android.os.PowerManager; import android.util.DisplayMetrics; @@ -37,6 +39,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.navigationbar.car.CarNavigationBarController; +import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.recents.Recents; import com.android.systemui.recents.ScreenPinningRequest; @@ -191,6 +194,8 @@ public class CarStatusBarModule { StatusBarKeyguardViewManager statusBarKeyguardViewManager, ViewMediatorCallback viewMediatorCallback, InitController initController, + DarkIconDispatcher darkIconDispatcher, + @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler, DismissCallbackRegistry dismissCallbackRegistry, CarServiceProvider carServiceProvider, Lazy<PowerManagerHelper> powerManagerHelperLazy, @@ -270,6 +275,8 @@ public class CarStatusBarModule { statusBarKeyguardViewManager, viewMediatorCallback, initController, + darkIconDispatcher, + timeTickHandler, dismissCallbackRegistry, carServiceProvider, powerManagerHelperLazy, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index a7084da48b9c..e96e2583065e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -30,6 +30,7 @@ import static android.view.WindowInsetsController.APPEARANCE_LOW_PROFILE_BARS; import static android.view.WindowInsetsController.APPEARANCE_OPAQUE_STATUS_BARS; import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; +import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME; import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_ASLEEP; import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE; import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAKING; @@ -385,6 +386,7 @@ public class StatusBar extends SystemUI implements DemoMode, private final SuperStatusBarViewFactory mSuperStatusBarViewFactory; private final LightsOutNotifController mLightsOutNotifController; private final InitController mInitController; + private final DarkIconDispatcher mDarkIconDispatcher; private final DismissCallbackRegistry mDismissCallbackRegistry; // expanded notifications @@ -683,6 +685,8 @@ public class StatusBar extends SystemUI implements DemoMode, StatusBarKeyguardViewManager statusBarKeyguardViewManager, ViewMediatorCallback viewMediatorCallback, InitController initController, + DarkIconDispatcher darkIconDispatcher, + @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler, DismissCallbackRegistry dismissCallbackRegistry) { super(context); mFeatureFlags = featureFlags; @@ -757,6 +761,7 @@ public class StatusBar extends SystemUI implements DemoMode, mStatusBarKeyguardViewManager = statusBarKeyguardViewManager; mKeyguardViewMediatorCallback = viewMediatorCallback; mInitController = initController; + mDarkIconDispatcher = darkIconDispatcher; mDismissCallbackRegistry = dismissCallbackRegistry; mBubbleExpandListener = @@ -764,6 +769,9 @@ public class StatusBar extends SystemUI implements DemoMode, mEntryManager.updateNotifications("onBubbleExpandChanged"); updateScrimController(); }; + + + DateTimeView.setReceiverHandler(timeTickHandler); } @Override @@ -798,8 +806,6 @@ public class StatusBar extends SystemUI implements DemoMode, mVibrateOnOpening = mContext.getResources().getBoolean( R.bool.config_vibrateOnIconAnimation); - DateTimeView.setReceiverHandler(Dependency.get(Dependency.TIME_TICK_HANDLER)); - // start old BaseStatusBar.start(). mWindowManagerService = WindowManagerGlobal.getWindowManagerService(); mDevicePolicyManager = (DevicePolicyManager) mContext.getSystemService( @@ -987,7 +993,7 @@ public class StatusBar extends SystemUI implements DemoMode, mNotificationPanel.setOnReinflationListener(mNotificationIconAreaController::initAodIcons); mNotificationPanel.addExpansionListener(mWakeUpCoordinator); - Dependency.get(DarkIconDispatcher.class).addDarkReceiver(mNotificationIconAreaController); + mDarkIconDispatcher.addDarkReceiver(mNotificationIconAreaController); // Allow plugins to reference DarkIconDispatcher and StatusBarStateController Dependency.get(PluginDependencyProvider.class) .allowPluginDependency(DarkIconDispatcher.class); @@ -1335,7 +1341,7 @@ public class StatusBar extends SystemUI implements DemoMode, // TODO: Bring these out of StatusBar. ((UserInfoControllerImpl) Dependency.get(UserInfoController.class)) .onDensityOrFontScaleChanged(); - Dependency.get(UserSwitcherController.class).onDensityOrFontScaleChanged(); + mUserSwitcherController.onDensityOrFontScaleChanged(); if (mKeyguardUserSwitcher != null) { mKeyguardUserSwitcher.onDensityOrFontScaleChanged(); } @@ -3427,8 +3433,7 @@ public class StatusBar extends SystemUI implements DemoMode, // ringing. // Other transitions are covered in handleVisibleToUserChanged(). if (mVisible && (newState == StatusBarState.SHADE_LOCKED - || (((SysuiStatusBarStateController) Dependency.get(StatusBarStateController.class)) - .goingToFullShade()))) { + || mStatusBarStateController.goingToFullShade())) { clearNotificationEffects(); } if (newState == StatusBarState.KEYGUARD) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java index 9824d1cd30e1..84a763e0b66e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java @@ -17,8 +17,10 @@ package com.android.systemui.statusbar.phone; import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME; +import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME; import android.content.Context; +import android.os.Handler; import android.os.PowerManager; import android.util.DisplayMetrics; @@ -37,6 +39,7 @@ import com.android.systemui.keyguard.DismissCallbackRegistry; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; +import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.recents.Recents; import com.android.systemui.recents.ScreenPinningRequest; @@ -171,6 +174,8 @@ public class StatusBarModule { StatusBarKeyguardViewManager statusBarKeyguardViewManager, ViewMediatorCallback viewMediatorCallback, InitController initController, + DarkIconDispatcher darkIconDispatcher, + @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler, DismissCallbackRegistry dismissCallbackRegistry) { return new StatusBar( context, @@ -246,6 +251,8 @@ public class StatusBarModule { statusBarKeyguardViewManager, viewMediatorCallback, initController, + darkIconDispatcher, + timeTickHandler, dismissCallbackRegistry); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index 6ee58bd861ef..61dd2aa431b3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -87,6 +87,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.plugins.ActivityStarter.OnDismissAction; +import com.android.systemui.plugins.DarkIconDispatcher; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.recents.Recents; import com.android.systemui.recents.ScreenPinningRequest; @@ -244,6 +245,7 @@ public class StatusBarTest extends SysuiTestCase { @Mock private LockscreenLockIconController mLockscreenLockIconController; @Mock private StatusBarNotificationActivityStarter.Builder mStatusBarNotificationActivityStarterBuilder; + @Mock private DarkIconDispatcher mDarkIconDispatcher; private ShadeController mShadeController; private FakeExecutor mUiBgExecutor = new FakeExecutor(new FakeSystemClock()); private InitController mInitController = new InitController(); @@ -396,6 +398,8 @@ public class StatusBarTest extends SysuiTestCase { mStatusBarKeyguardViewManager, mViewMediatorCallback, mInitController, + mDarkIconDispatcher, + new Handler(TestableLooper.get(this).getLooper()), mDismissCallbackRegistry); when(mStatusBarWindowView.findViewById(R.id.lock_icon_container)).thenReturn( |