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

Commit 13cca1ef authored by Justin Weir's avatar Justin Weir
Browse files

Replace Dependency.get with Dagger 

Bug: 218354102
Test: atest SystemUITests SystemUIGoogleTests
Change-Id: I0d5d51a686e726749c5f67c10fe35bc5c12dbc95
parent 008fef60

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

+9 −5
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.widget.LinearLayout.LayoutParams; 
import androidx.annotation.VisibleForTesting;



import com.android.internal.statusbar.StatusBarIcon;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.demomode.DemoModeCommandReceiver;
@@ -137,11 +136,12 @@ public interface StatusBarIconController { 
                LinearLayout linearLayout,

                FeatureFlags featureFlags,

                StatusBarPipelineFlags statusBarPipelineFlags,

                Provider<WifiViewModel> wifiViewModelProvider) {

                Provider<WifiViewModel> wifiViewModelProvider,

                DarkIconDispatcher darkIconDispatcher) {

            super(linearLayout, featureFlags, statusBarPipelineFlags, wifiViewModelProvider);

            mIconHPadding = mContext.getResources().getDimensionPixelSize(

                    R.dimen.status_bar_icon_padding);

            mDarkIconDispatcher = Dependency.get(DarkIconDispatcher.class);

            mDarkIconDispatcher = darkIconDispatcher;

        }



        @Override
@@ -198,20 +198,24 @@ public interface StatusBarIconController { 
            private final FeatureFlags mFeatureFlags;

            private final StatusBarPipelineFlags mStatusBarPipelineFlags;

            private final Provider<WifiViewModel> mWifiViewModelProvider;

            private final DarkIconDispatcher mDarkIconDispatcher;



            @Inject

            public Factory(

                    FeatureFlags featureFlags,

                    StatusBarPipelineFlags statusBarPipelineFlags,

                    Provider<WifiViewModel> wifiViewModelProvider) {

                    Provider<WifiViewModel> wifiViewModelProvider,

                    DarkIconDispatcher darkIconDispatcher) {

                mFeatureFlags = featureFlags;

                mStatusBarPipelineFlags = statusBarPipelineFlags;

                mWifiViewModelProvider = wifiViewModelProvider;

                mDarkIconDispatcher = darkIconDispatcher;

            }



            public DarkIconManager create(LinearLayout group) {

                return new DarkIconManager(

                        group, mFeatureFlags, mStatusBarPipelineFlags, mWifiViewModelProvider);

                        group, mFeatureFlags, mStatusBarPipelineFlags, mWifiViewModelProvider,

                        mDarkIconDispatcher);

            }

        }

    }

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

+6 −4
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ public class StatusBarIconControllerTest extends LeakCheckedTest { 
    @Before

    public void setup() {

        injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES);

        mDependency.injectMockDependency(DarkIconDispatcher.class);

    }



    @Test
@@ -75,7 +74,8 @@ public class StatusBarIconControllerTest extends LeakCheckedTest { 
                layout,

                mock(FeatureFlags.class),

                mock(StatusBarPipelineFlags.class),

                () -> mock(WifiViewModel.class));

                () -> mock(WifiViewModel.class),

                mock(DarkIconDispatcher.class));

        testCallOnAdd_forManager(manager);

    }
@@ -116,8 +116,10 @@ public class StatusBarIconControllerTest extends LeakCheckedTest { 
                LinearLayout group,

                FeatureFlags featureFlags,

                StatusBarPipelineFlags statusBarPipelineFlags,

                Provider<WifiViewModel> wifiViewModelProvider) {

            super(group, featureFlags, statusBarPipelineFlags, wifiViewModelProvider);

                Provider<WifiViewModel> wifiViewModelProvider,

                DarkIconDispatcher darkIconDispatcher) {

            super(group, featureFlags, statusBarPipelineFlags, wifiViewModelProvider,

                    darkIconDispatcher);

        }



        @Override