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

Commit a0da22d0 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Inject DarkIconDispatcher into StatusBar 

Bug: 141882822
Test: atest SystemUITests
Change-Id: I35427de4bd19b1694a32f95f76bcb71dda349eea
parent e11ebed0

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,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 +322,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            ViewMediatorCallback viewMediatorCallback,

            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            DismissCallbackRegistry dismissCallbackRegistry,

            /* Car Settings injected components. */

            CarServiceProvider carServiceProvider,
@@ -402,6 +404,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                statusBarKeyguardViewManager,

                viewMediatorCallback,

                initController,

                darkIconDispatcher,

                dismissCallbackRegistry);

        mScrimController = scrimController;

        mLockscreenLockIconController = lockscreenLockIconController;

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,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 +192,7 @@ public class CarStatusBarModule { 
            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            ViewMediatorCallback viewMediatorCallback,

            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            DismissCallbackRegistry dismissCallbackRegistry,

            CarServiceProvider carServiceProvider,

            Lazy<PowerManagerHelper> powerManagerHelperLazy,
@@ -270,6 +272,7 @@ public class CarStatusBarModule { 
                statusBarKeyguardViewManager,

                viewMediatorCallback,

                initController,

                darkIconDispatcher,

                dismissCallbackRegistry,

                carServiceProvider,

                powerManagerHelperLazy,

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+4 −1
Original line number Diff line number Diff line
@@ -385,6 +385,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 +684,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            ViewMediatorCallback viewMediatorCallback,

            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            DismissCallbackRegistry dismissCallbackRegistry) {

        super(context);

        mFeatureFlags = featureFlags;
@@ -757,6 +759,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

        mKeyguardViewMediatorCallback = viewMediatorCallback;

        mInitController = initController;

        mDarkIconDispatcher = darkIconDispatcher;

        mDismissCallbackRegistry = dismissCallbackRegistry;



        mBubbleExpandListener =
@@ -987,7 +990,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);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarModule.java

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,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 +172,7 @@ public class StatusBarModule { 
            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            ViewMediatorCallback viewMediatorCallback,

            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            DismissCallbackRegistry dismissCallbackRegistry) {

        return new StatusBar(

                context,
@@ -246,6 +248,7 @@ public class StatusBarModule { 
                statusBarKeyguardViewManager,

                viewMediatorCallback,

                initController,

                darkIconDispatcher,

                dismissCallbackRegistry);

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

+3 −0
Original line number Diff line number Diff line
@@ -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,7 @@ public class StatusBarTest extends SysuiTestCase { 
                mStatusBarKeyguardViewManager,

                mViewMediatorCallback,

                mInitController,

                mDarkIconDispatcher,

                mDismissCallbackRegistry);



        when(mStatusBarWindowView.findViewById(R.id.lock_icon_container)).thenReturn(