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

Commit 84d8829d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I77c61f74,I569123ca,Idf70d205,I308ea00b 

* changes:
  setCurrentState(DESTROYED) called from main thread
  Enforce setCurrentState calls are on main thread
  Refactor QSTileImpl and remove Dependency.get
  QSTileImpl is set to DESTROYED when handleDestroy
parents a3c01dcf 8cf0a2a2

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

+7 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.content.pm.ShortcutManager; 
import android.content.res.Resources;

import android.hardware.SensorManager;

import android.hardware.SensorPrivacyManager;

import android.hardware.display.ColorDisplayManager;

import android.hardware.display.DisplayManager;

import android.media.AudioManager;

import android.media.MediaRouter2Manager;
@@ -105,6 +106,12 @@ public class SystemServicesModule { 
        return context.getSystemService(AudioManager.class);

    }



    @Provides

    @Singleton

    static ColorDisplayManager provideColorDisplayManager(Context context) {

        return context.getSystemService(ColorDisplayManager.class);

    }



    @Provides

    @Singleton

    static ConnectivityManager provideConnectivityManagager(Context context) {

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

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import com.android.internal.logging.InstanceId; 
import com.android.internal.logging.UiEventLogger;

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

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

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



import java.util.Collection;
@@ -31,7 +30,6 @@ public interface QSHost { 
    void openPanels();

    Context getContext();

    Context getUserContext();

    QSLogger getQSLogger();

    UiEventLogger getUiEventLogger();

    Collection<QSTile> getTiles();

    void addCallback(Callback callback);

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

+0 −4
Original line number Diff line number Diff line
@@ -179,10 +179,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
        onTuningChanged(TILES_SETTING, value);

    }



    public QSLogger getQSLogger() {

        return mQSLogger;

    }



    @Override

    public UiEventLogger getUiEventLogger() {

        return mUiEventLogger;

packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java

+103 −4
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ import android.graphics.drawable.Drawable; 
import android.metrics.LogMaker;

import android.net.Uri;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.RemoteException;

import android.provider.Settings;

import android.service.quicksettings.IQSTileService;
@@ -42,16 +44,27 @@ import android.view.IWindowManager; 
import android.view.WindowManagerGlobal;

import android.widget.Switch;



import androidx.annotation.NonNull;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.systemui.Dependency;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.qs.QSTile.State;

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

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener;

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

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



import java.util.Objects;



import javax.inject.Inject;



import dagger.Lazy;



public class CustomTile extends QSTileImpl<State> implements TileChangeListener {

    public static final String PREFIX = "custom(";
@@ -79,8 +92,19 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener 
    private boolean mIsTokenGranted;

    private boolean mIsShowingDialog;



    private CustomTile(QSHost host, String action, Context userContext) {

        super(host);

    private CustomTile(

            QSHost host,

            Looper backgroundLooper,

            Handler mainHandler,

            MetricsLogger metricsLogger,

            StatusBarStateController statusBarStateController,

            ActivityStarter activityStarter,

            QSLogger qsLogger,

            String action,

            Context userContext

    ) {

        super(host, backgroundLooper, mainHandler, metricsLogger, statusBarStateController,

                activityStarter, qsLogger);

        mWindowManager = WindowManagerGlobal.getWindowManagerService();

        mComponent = ComponentName.unflattenFromString(action);

        mTile = new Tile();
@@ -397,7 +421,7 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener 
        return ComponentName.unflattenFromString(action);

    }



    public static CustomTile create(QSHost host, String spec, Context userContext) {

    private static String getAction(String spec) {

        if (spec == null || !spec.startsWith(PREFIX) || !spec.endsWith(")")) {

            throw new IllegalArgumentException("Bad custom tile spec: " + spec);

        }
@@ -405,6 +429,81 @@ public class CustomTile extends QSTileImpl<State> implements TileChangeListener 
        if (action.isEmpty()) {

            throw new IllegalArgumentException("Empty custom tile spec action");

        }

        return new CustomTile(host, action, userContext);

        return action;

    }



    /**

     * Create a {@link CustomTile} for a given spec and user.

     *

     * @param builder including injected common dependencies.

     * @param spec as provided by {@link CustomTile#toSpec}

     * @param userContext context for the user that is creating this tile.

     * @return a new {@link CustomTile}

     */

    public static CustomTile create(Builder builder, String spec, Context userContext) {

        return builder

                .setSpec(spec)

                .setUserContext(userContext)

                .build();

    }



    public static class Builder {

        final Lazy<QSHost> mQSHostLazy;

        final Looper mBackgroundLooper;

        final Handler mMainHandler;

        final MetricsLogger mMetricsLogger;

        final StatusBarStateController mStatusBarStateController;

        final ActivityStarter mActivityStarter;

        final QSLogger mQSLogger;



        Context mUserContext;

        String mSpec = "";



        @Inject

        public Builder(

                Lazy<QSHost> hostLazy,

                @Background Looper backgroundLooper,

                @Main Handler mainHandler,

                MetricsLogger metricsLogger,

                StatusBarStateController statusBarStateController,

                ActivityStarter activityStarter,

                QSLogger qsLogger

        ) {

            mQSHostLazy = hostLazy;

            mBackgroundLooper = backgroundLooper;

            mMainHandler = mainHandler;

            mMetricsLogger = metricsLogger;

            mStatusBarStateController = statusBarStateController;

            mActivityStarter = activityStarter;

            mQSLogger = qsLogger;

        }



        Builder setSpec(@NonNull String spec) {

            mSpec = spec;

            return this;

        }



        Builder setUserContext(@NonNull Context userContext) {

            mUserContext = userContext;

            return this;

        }



        CustomTile build() {

            if (mUserContext == null) {

                throw new NullPointerException("UserContext cannot be null");

            }

            String action = getAction(mSpec);

            return new CustomTile(

                    mQSHostLazy.get(),

                    mBackgroundLooper,

                    mMainHandler,

                    mMetricsLogger,

                    mStatusBarStateController,

                    mActivityStarter,

                    mQSLogger,

                    action,

                    mUserContext

            );

        }

    }

}

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java

+8 −3
Original line number Diff line number Diff line
@@ -80,9 +80,12 @@ public class QSFactoryImpl implements QSFactory { 
    private final Provider<ScreenRecordTile> mScreenRecordTileProvider;



    private final Lazy<QSHost> mQsHostLazy;

    private final Provider<CustomTile.Builder> mCustomTileBuilderProvider;



    @Inject

    public QSFactoryImpl(Lazy<QSHost> qsHostLazy,

    public QSFactoryImpl(

            Lazy<QSHost> qsHostLazy,

            Provider<CustomTile.Builder> customTileBuilderProvider,

            Provider<WifiTile> wifiTileProvider,

            Provider<BluetoothTile> bluetoothTileProvider,

            Provider<CellularTile> cellularTileProvider,
@@ -104,6 +107,8 @@ public class QSFactoryImpl implements QSFactory { 
            Provider<UiModeNightTile> uiModeNightTileProvider,

            Provider<ScreenRecordTile> screenRecordTileProvider) {

        mQsHostLazy = qsHostLazy;

        mCustomTileBuilderProvider = customTileBuilderProvider;



        mWifiTileProvider = wifiTileProvider;

        mBluetoothTileProvider = bluetoothTileProvider;

        mCellularTileProvider = cellularTileProvider;
@@ -179,8 +184,8 @@ public class QSFactoryImpl implements QSFactory { 


        // Custom tiles

        if (tileSpec.startsWith(CustomTile.PREFIX)) {

            return CustomTile.create(mQsHostLazy.get(), tileSpec,

                    mQsHostLazy.get().getUserContext());

            return CustomTile.create(

                    mCustomTileBuilderProvider.get(), tileSpec, mQsHostLazy.get().getUserContext());

        }



        // Debug tiles.