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

Commit afb52eb8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Status Bar Refactor] Move PhoneStatusBarViewController's creation into... 

Merge "[Status Bar Refactor] Move PhoneStatusBarViewController's creation into the Dagger component." into sc-v2-dev am: 9a74e369 am: d9ff1b5c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16250383

Change-Id: I834d95d1d3b08d9cf8344ae7235f620c975a1302
parents 7d960ede d9ff1b5c

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

+2 −9
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ public class StatusBar extends CoreStartable implements 
    private QSPanelController mQSPanelController;



    private final OperatorNameViewController.Factory mOperatorNameViewControllerFactory;

    private final PhoneStatusBarViewController.Factory mPhoneStatusBarViewControllerFactory;

    KeyguardIndicationController mKeyguardIndicationController;



    private View mReportRejectedTouch;
@@ -767,7 +766,6 @@ public class StatusBar extends CoreStartable implements 
            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            OperatorNameViewController.Factory operatorNameViewControllerFactory,

            PhoneStatusBarViewController.Factory phoneStatusBarViewControllerFactory,

            PhoneStatusBarPolicy phoneStatusBarPolicy,

            KeyguardIndicationController keyguardIndicationController,

            DemoModeController demoModeController,
@@ -807,7 +805,6 @@ public class StatusBar extends CoreStartable implements 
        mKeyguardStateController = keyguardStateController;

        mHeadsUpManager = headsUpManagerPhone;

        mOperatorNameViewControllerFactory = operatorNameViewControllerFactory;

        mPhoneStatusBarViewControllerFactory = phoneStatusBarViewControllerFactory;

        mKeyguardIndicationController = keyguardIndicationController;

        mStatusBarTouchableRegionManager = statusBarTouchableRegionManager;

        mDynamicPrivacyController = dynamicPrivacyController;
@@ -1153,12 +1150,8 @@ public class StatusBar extends CoreStartable 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

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java

+0 −3
Original line number Diff line number Diff line
@@ -89,7 +89,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;
@@ -217,7 +216,6 @@ public interface StatusBarPhoneModule { 
            ExtensionController extensionController,

            UserInfoControllerImpl userInfoControllerImpl,

            OperatorNameViewController.Factory operatorNameViewControllerFactory,

            PhoneStatusBarViewController.Factory phoneStatusBarViewControllerFactory,

            PhoneStatusBarPolicy phoneStatusBarPolicy,

            KeyguardIndicationController keyguardIndicationController,

            DemoModeController demoModeController,
@@ -319,7 +317,6 @@ public interface StatusBarPhoneModule { 
                extensionController,

                userInfoControllerImpl,

                operatorNameViewControllerFactory,

                phoneStatusBarViewControllerFactory,

                phoneStatusBarPolicy,

                keyguardIndicationController,

                demoModeController,

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/StatusBarFragmentComponent.java

+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();

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/StatusBarFragmentModule.java

+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());

    }

}

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

+0 −2
Original line number Diff line number Diff line
@@ -279,7 +279,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;

    @Mock private NotifPipelineFlags mNotifPipelineFlags;

    private ShadeController mShadeController;
@@ -446,7 +445,6 @@ public class StatusBarTest extends SysuiTestCase { 
                mExtensionController,

                mUserInfoControllerImpl,

                mOperatorNameViewControllerFactory,

                mPhoneStatusBarViewControllerFactory,

                mPhoneStatusBarPolicy,

                mKeyguardIndicationController,

                mDemoModeController,