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

Commit f886917e authored by Caitlin Cassidy's avatar Caitlin Cassidy
Browse files

[Status Bar Refactor] Move PhoneStatusBarViewController's creation into

the Dagger component.

Test: manual
Test: atest SystemUITests
Bug: 205609837
Change-Id: Ib29a5cfcaf173c1404e5033f2ef21dc67e59b1fb
parent d25d79f9
Loading
Loading
Loading
Loading
+2 −9
Original line number Diff line number Diff line
@@ -519,7 +519,6 @@ public class StatusBar extends SystemUI implements
    private QSPanelController mQSPanelController;

    private final OperatorNameViewController.Factory mOperatorNameViewControllerFactory;
    private final PhoneStatusBarViewController.Factory mPhoneStatusBarViewControllerFactory;
    KeyguardIndicationController mKeyguardIndicationController;

    private View mReportRejectedTouch;
@@ -764,7 +763,6 @@ public class StatusBar extends SystemUI implements
            ExtensionController extensionController,
            UserInfoControllerImpl userInfoControllerImpl,
            OperatorNameViewController.Factory operatorNameViewControllerFactory,
            PhoneStatusBarViewController.Factory phoneStatusBarViewControllerFactory,
            PhoneStatusBarPolicy phoneStatusBarPolicy,
            KeyguardIndicationController keyguardIndicationController,
            DemoModeController demoModeController,
@@ -803,7 +801,6 @@ public class StatusBar extends SystemUI implements
        mKeyguardStateController = keyguardStateController;
        mHeadsUpManager = headsUpManagerPhone;
        mOperatorNameViewControllerFactory = operatorNameViewControllerFactory;
        mPhoneStatusBarViewControllerFactory = phoneStatusBarViewControllerFactory;
        mKeyguardIndicationController = keyguardIndicationController;
        mStatusBarTouchableRegionManager = statusBarTouchableRegionManager;
        mDynamicPrivacyController = dynamicPrivacyController;
@@ -1148,12 +1145,8 @@ public class StatusBar extends SystemUI implements
                    }

                    mStatusBarView = statusBarFragmentComponent.getPhoneStatusBarView();

                    // TODO(b/205609837): Migrate this to StatusBarFragmentComponent.
                    mPhoneStatusBarViewController = mPhoneStatusBarViewControllerFactory
                            .create(mStatusBarView, mNotificationPanelViewController
                                    .getStatusBarTouchEventHandler());
                    mPhoneStatusBarViewController.init();
                    mPhoneStatusBarViewController =
                            statusBarFragmentComponent.getPhoneStatusBarViewController();

                    // Ensure we re-propagate panel expansion values to the panel controller and
                    // any listeners it may have, such as PanelBar. This will also ensure we
+0 −3
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ import com.android.systemui.statusbar.phone.LockscreenGestureLogger;
import com.android.systemui.statusbar.phone.LockscreenWallpaper;
import com.android.systemui.statusbar.phone.NotificationIconAreaController;
import com.android.systemui.statusbar.phone.PhoneStatusBarPolicy;
import com.android.systemui.statusbar.phone.PhoneStatusBarViewController;
import com.android.systemui.statusbar.phone.ScrimController;
import com.android.systemui.statusbar.phone.ShadeController;
import com.android.systemui.statusbar.phone.StatusBar;
@@ -216,7 +215,6 @@ public interface StatusBarPhoneModule {
            ExtensionController extensionController,
            UserInfoControllerImpl userInfoControllerImpl,
            OperatorNameViewController.Factory operatorNameViewControllerFactory,
            PhoneStatusBarViewController.Factory phoneStatusBarViewControllerFactory,
            PhoneStatusBarPolicy phoneStatusBarPolicy,
            KeyguardIndicationController keyguardIndicationController,
            DemoModeController demoModeController,
@@ -317,7 +315,6 @@ public interface StatusBarPhoneModule {
                extensionController,
                userInfoControllerImpl,
                operatorNameViewControllerFactory,
                phoneStatusBarViewControllerFactory,
                phoneStatusBarPolicy,
                keyguardIndicationController,
                demoModeController,
+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.systemui.battery.BatteryMeterViewController;
import com.android.systemui.dagger.qualifiers.RootView;
import com.android.systemui.statusbar.phone.HeadsUpAppearanceController;
import com.android.systemui.statusbar.phone.PhoneStatusBarView;
import com.android.systemui.statusbar.phone.PhoneStatusBarViewController;
import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment;

import dagger.BindsInstance;
@@ -58,6 +59,7 @@ public interface StatusBarFragmentComponent {
        // get initialized.
        getBatteryMeterViewController().init();
        getHeadsUpAppearanceController().init();
        getPhoneStatusBarViewController().init();
    }

    /** */
@@ -69,6 +71,10 @@ public interface StatusBarFragmentComponent {
    @RootView
    PhoneStatusBarView getPhoneStatusBarView();

    /** */
    @StatusBarFragmentScope
    PhoneStatusBarViewController getPhoneStatusBarViewController();

    /** */
    @StatusBarFragmentScope
    HeadsUpAppearanceController getHeadsUpAppearanceController();
+14 −0
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ package com.android.systemui.statusbar.phone.fragment.dagger;
import com.android.systemui.R;
import com.android.systemui.battery.BatteryMeterView;
import com.android.systemui.dagger.qualifiers.RootView;
import com.android.systemui.statusbar.phone.NotificationPanelViewController;
import com.android.systemui.statusbar.phone.PhoneStatusBarView;
import com.android.systemui.statusbar.phone.PhoneStatusBarViewController;
import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment;

import dagger.Module;
@@ -43,4 +45,16 @@ public interface StatusBarFragmentModule {
    static BatteryMeterView provideBatteryMeterView(@RootView PhoneStatusBarView view) {
        return view.findViewById(R.id.battery);
    }

    /** */
    @Provides
    @StatusBarFragmentScope
    static PhoneStatusBarViewController providePhoneStatusBarViewController(
            PhoneStatusBarViewController.Factory phoneStatusBarViewControllerFactory,
            @RootView PhoneStatusBarView phoneStatusBarView,
            NotificationPanelViewController notificationPanelViewController) {
        return phoneStatusBarViewControllerFactory.create(
                phoneStatusBarView,
                notificationPanelViewController.getStatusBarTouchEventHandler());
    }
}
+0 −2
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ public class StatusBarTest extends SysuiTestCase {
    @Mock private StartingSurface mStartingSurface;
    @Mock private OperatorNameViewController mOperatorNameViewController;
    @Mock private OperatorNameViewController.Factory mOperatorNameViewControllerFactory;
    @Mock private PhoneStatusBarViewController.Factory mPhoneStatusBarViewControllerFactory;
    @Mock private ActivityLaunchAnimator mActivityLaunchAnimator;
    private ShadeController mShadeController;
    private final FakeSystemClock mFakeSystemClock = new FakeSystemClock();
@@ -433,7 +432,6 @@ public class StatusBarTest extends SysuiTestCase {
                mExtensionController,
                mUserInfoControllerImpl,
                mOperatorNameViewControllerFactory,
                mPhoneStatusBarViewControllerFactory,
                mPhoneStatusBarPolicy,
                mKeyguardIndicationController,
                mDemoModeController,