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

Commit 90cd6110 authored by Ben Lin's avatar Ben Lin
Browse files

Move ShadeController to SystemUIFactory to allow customization. 

ShadeController is implemented by StatusBar, which is possible to be
swapped by OEMs via using config_statusBarComponent.

Bug: 122277074
Test: Compiles
Change-Id: Ia714405803a37deca9a694d07772e005902ab6bc
parent 5c5513f2

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

+0 −8
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ import com.android.systemui.shared.plugins.PluginManagerImpl; 
import com.android.systemui.statusbar.NavigationBarController;

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

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

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

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

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.DataSaverController;

import com.android.systemui.statusbar.policy.NetworkController;
@@ -139,12 +137,6 @@ public class DependencyProvider { 
        return new DisplayMetrics();

    }



    @Singleton

    @Provides

    public ShadeController provideShadeController(Context context) {

        return SysUiServiceProvider.getComponent(context, StatusBar.class);

    }



    @Singleton

    @Provides

    public SensorPrivacyManager provideSensorPrivacyManager(Context context) {

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

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.systemui.statusbar.phone.LockscreenWallpaper; 
import com.android.systemui.statusbar.phone.NotificationIconAreaController;

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

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

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

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

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

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -208,6 +209,12 @@ public class SystemUIFactory { 
        return true;

    }



    @Singleton

    @Provides

    public ShadeController provideShadeController(Context context) {

        return SysUiServiceProvider.getComponent(context, StatusBar.class);

    }



    @Module

    protected static class ContextHolder {

        private Context mContext;