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

Commit dada598a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Provide QSFactory" into rvc-dev am: bc67fc79 

Change-Id: Ief5b7e1bd879e007c819fb6e1d94742b5a8f108e
parents 3031bb57 bc67fc79

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+6 −0
Original line number Diff line number Diff line
@@ -27,9 +27,11 @@ import com.android.systemui.car.CarDeviceProvisionedControllerImpl; 
import com.android.systemui.dagger.SystemUIRootComponent;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.plugins.qs.QSFactory;

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

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.qs.tileimpl.QSFactoryImpl;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.stackdivider.DividerModule;
@@ -106,6 +108,10 @@ abstract class CarSystemUIModule { 
    public abstract BatteryController provideBatteryController(

            BatteryControllerImpl controllerImpl);



    @Binds

    @Singleton

    public abstract QSFactory provideQSFactory(QSFactoryImpl qsFactoryImpl);



    @Binds

    abstract DockManager bindDockManager(DockManagerImpl dockManager);

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 


    <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->

    <string name="quick_settings_tiles_stock" translatable="false">

        wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night,screenrecord

        wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night,screenrecord,reverse

    </string>



    <!-- The tiles to display in QuickSettings -->

packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java

+6 −0
Original line number Diff line number Diff line
@@ -26,9 +26,11 @@ import androidx.annotation.Nullable; 
import com.android.keyguard.KeyguardViewController;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.plugins.qs.QSFactory;

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

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.qs.tileimpl.QSFactoryImpl;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.stackdivider.DividerModule;
@@ -84,6 +86,10 @@ public abstract class SystemUIDefaultModule { 
    public abstract BatteryController provideBatteryController(

            BatteryControllerImpl controllerImpl);



    @Binds

    @Singleton

    public abstract QSFactory provideQSFactory(QSFactoryImpl qsFactoryImpl);



    @Binds

    abstract DockManager bindDockManager(DockManagerImpl dockManager);

packages/SystemUI/src/com/android/systemui/qs/QSHost.java

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ public interface QSHost { 
    void forceCollapsePanels();

    void openPanels();

    Context getContext();

    Context getUserContext();

    QSLogger getQSLogger();

    Collection<QSTile> getTiles();

    void addCallback(Callback callback);

packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import com.android.systemui.qs.external.CustomTile; 
import com.android.systemui.qs.external.TileLifecycleManager;

import com.android.systemui.qs.external.TileServices;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSFactoryImpl;

import com.android.systemui.shared.plugins.PluginManager;

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

import com.android.systemui.statusbar.phone.StatusBar;
@@ -98,7 +97,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
    @Inject

    public QSTileHost(Context context,

            StatusBarIconController iconController,

            QSFactoryImpl defaultFactory,

            QSFactory defaultFactory,

            @Main Handler mainHandler,

            @Background Looper bgLooper,

            PluginManager pluginManager,
@@ -120,7 +119,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
        mServices = new TileServices(this, bgLooper, mBroadcastDispatcher);

        mStatusBarOptional = statusBarOptional;



        defaultFactory.setHost(this);

        mQsFactories.add(defaultFactory);

        pluginManager.addPluginListener(this, QSFactory.class, true);

        mDumpManager.registerDumpable(TAG, this);
@@ -211,10 +209,12 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
        return mContext;

    }



    @Override

    public Context getUserContext() {

        return mUserContext;

    }



    @Override

    public TileServices getTileServices() {

        return mServices;

    }