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

Commit 80110913 authored by Beverly's avatar Beverly
Browse files

Add StatusBarStateController to DependencyBinder 

Test: manual
Change-Id: Idb0ab24a1b3eafc8c1b484aa1c328ce311257943
Fixes: 124342913
parent 83f81571

packages/SystemUI/src/com/android/systemui/DependencyBinder.java

+8 −0
Original line number Diff line number Diff line
@@ -21,11 +21,13 @@ import com.android.systemui.appops.AppOpsControllerImpl; 
import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.VolumeDialogController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.PowerNotificationWarnings;

import com.android.systemui.power.PowerUI;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.QSTileHost;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.phone.DarkIconDispatcherImpl;

import com.android.systemui.statusbar.phone.ManagedProfileController;

import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;
@@ -191,6 +193,12 @@ public abstract class DependencyBinder { 
    public abstract DarkIconDispatcher provideDarkIconDispatcher(

            DarkIconDispatcherImpl controllerImpl);



    /**

     */

    @Binds

    public abstract StatusBarStateController provideStatusBarStateController(

            StatusBarStateControllerImpl controllerImpl);



    /**

     */

    @Binds

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+0 −10
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.systemui.statusbar.NotificationListener; 
import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;

import com.android.systemui.statusbar.ScrimView;

import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationInterruptionStateProvider;

import com.android.systemui.statusbar.notification.collection.NotificationData;
@@ -153,15 +152,6 @@ public class SystemUIFactory { 
        return new VolumeDialogComponent(systemUi, context);

    }



    /**

     * Provides status bar state controller implementation

     */

    @Singleton

    @Provides

    public StatusBarStateController provideStatusBarStateController(Context context) {

        return new StatusBarStateControllerImpl();

    }



    @Singleton

    @Provides

    public NotificationData.KeyguardEnvironment provideKeyguardEnvironment(Context context) {

packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java

+4 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.view.View; 
import android.view.ViewGroup;



import com.android.systemui.R;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.VisualStabilityManager;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;
@@ -61,7 +62,7 @@ public class NotificationViewHierarchyManager { 
    protected final NotificationLockscreenUserManager mLockscreenUserManager;

    protected final NotificationGroupManager mGroupManager;

    protected final VisualStabilityManager mVisualStabilityManager;

    private final StatusBarStateControllerImpl mStatusBarStateController;

    private final SysuiStatusBarStateController mStatusBarStateController;

    private final NotificationEntryManager mEntryManager;



    // Lazy
@@ -82,13 +83,13 @@ public class NotificationViewHierarchyManager { 
            NotificationLockscreenUserManager notificationLockscreenUserManager,

            NotificationGroupManager groupManager,

            VisualStabilityManager visualStabilityManager,

            StatusBarStateControllerImpl statusBarStateController,

            StatusBarStateController statusBarStateController,

            NotificationEntryManager notificationEntryManager,

            Lazy<ShadeController> shadeController) {

        mLockscreenUserManager = notificationLockscreenUserManager;

        mGroupManager = groupManager;

        mVisualStabilityManager = visualStabilityManager;

        mStatusBarStateController = statusBarStateController;

        mStatusBarStateController = (SysuiStatusBarStateController) statusBarStateController;

        mEntryManager = notificationEntryManager;

        mShadeController = shadeController;

        Resources res = context.getResources();

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

+1 −2
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ import com.android.systemui.statusbar.NotificationShelf; 
import com.android.systemui.statusbar.NotificationViewHierarchyManager;

import com.android.systemui.statusbar.ScrimView;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.notification.ActivityLaunchAnimator;
@@ -653,7 +652,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


        mColorExtractor.addOnColorsChangedListener(this);

        mStatusBarStateController.addCallback(this,

                StatusBarStateControllerImpl.RANK_STATUS_BAR);

                SysuiStatusBarStateController.RANK_STATUS_BAR);



        mWindowManager = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);

        mDreamManager = IDreamManager.Stub.asInterface(