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

Commit ca44a97a authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[ProviderModel] Internal cleanup, remove the Provider Model flag"

parents 4d6ea2fb 29c2e807

core/java/android/util/FeatureFlagUtils.java

+0 −4
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ public class FeatureFlagUtils { 
    public static final String SETTINGS_DO_NOT_RESTORE_PRESERVED =

            "settings_do_not_restore_preserved";

    /** @hide */

    public static final String SETTINGS_PROVIDER_MODEL = "settings_provider_model";

    /** @hide */

    public static final String SETTINGS_USE_NEW_BACKUP_ELIGIBILITY_RULES

            = "settings_use_new_backup_eligibility_rules";

    /** @hide */
@@ -80,7 +78,6 @@ public class FeatureFlagUtils { 


        DEFAULT_FLAGS.put("settings_tether_all_in_one", "false");

        DEFAULT_FLAGS.put("settings_contextual_home", "false");

        DEFAULT_FLAGS.put(SETTINGS_PROVIDER_MODEL, "true");

        DEFAULT_FLAGS.put(SETTINGS_USE_NEW_BACKUP_ELIGIBILITY_RULES, "true");

        DEFAULT_FLAGS.put(SETTINGS_ENABLE_SECURITY_HUB, "true");

        DEFAULT_FLAGS.put(SETTINGS_SUPPORT_LARGE_SCREEN, "true");
@@ -92,7 +89,6 @@ public class FeatureFlagUtils { 
    static {

        PERSISTENT_FLAGS = new HashSet<>();

        PERSISTENT_FLAGS.add(SETTINGS_APP_LANGUAGE_SELECTION);

        PERSISTENT_FLAGS.add(SETTINGS_PROVIDER_MODEL);

        PERSISTENT_FLAGS.add(SETTINGS_SUPPORT_LARGE_SCREEN);

        PERSISTENT_FLAGS.add(SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS);

    }

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ public class Flags { 


    /***************************************/

    // 600- status bar

    public static final BooleanFlag STATUS_BAR_PROVIDER_MODEL =

            new BooleanFlag(600, false);



    public static final BooleanFlag COMBINED_STATUS_BAR_SIGNAL_ICONS =

            new BooleanFlag(601, false);

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

+16 −26
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.systemui.dagger.SysUISingleton; 
import com.android.systemui.dagger.qualifiers.Background;

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

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.plugins.PluginListener;

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

import com.android.systemui.plugins.qs.QSTile;
@@ -53,7 +52,6 @@ import com.android.systemui.qs.external.TileServices; 
import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.settings.UserTracker;

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

import com.android.systemui.statusbar.connectivity.StatusBarFlags;

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

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

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -98,7 +96,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
    private final UiEventLogger mUiEventLogger;

    private final InstanceIdSequence mInstanceIdSequence;

    private final CustomTileStatePersister mCustomTileStatePersister;

    private final FeatureFlags mFeatureFlags;



    private final List<Callback> mCallbacks = new ArrayList<>();

    private AutoTileManager mAutoTiles;
@@ -111,7 +108,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
    private SecureSettings mSecureSettings;



    private final TileServiceRequestController mTileServiceRequestController;

    private final StatusBarFlags mStatusBarFlags;



    @Inject

    public QSTileHost(Context context,
@@ -130,9 +126,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
            UserTracker userTracker,

            SecureSettings secureSettings,

            CustomTileStatePersister customTileStatePersister,

            TileServiceRequestController.Builder tileServiceRequestControllerBuilder,

            FeatureFlags featureFlags,

            StatusBarFlags statusBarFlags

            TileServiceRequestController.Builder tileServiceRequestControllerBuilder

    ) {

        mIconController = iconController;

        mContext = context;
@@ -144,7 +138,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
        mUiEventLogger = uiEventLogger;

        mBroadcastDispatcher = broadcastDispatcher;

        mTileServiceRequestController = tileServiceRequestControllerBuilder.create(this);

        mStatusBarFlags = statusBarFlags;



        mInstanceIdSequence = new InstanceIdSequence(MAX_QS_INSTANCE_ID);

        mServices = new TileServices(this, bgLooper, mBroadcastDispatcher, userTracker);
@@ -156,7 +149,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
        mUserTracker = userTracker;

        mSecureSettings = secureSettings;

        mCustomTileStatePersister = customTileStatePersister;

        mFeatureFlags = featureFlags;



        mainHandler.post(() -> {

            // This is technically a hack to avoid circular dependency of
@@ -280,7 +272,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
        if (newValue == null && UserManager.isDeviceInDemoMode(mContext)) {

            newValue = mContext.getResources().getString(R.string.quick_settings_tiles_retail_mode);

        }

        final List<String> tileSpecs = loadTileSpecs(mContext, newValue, mStatusBarFlags);

        final List<String> tileSpecs = loadTileSpecs(mContext, newValue);

        int currentUser = mUserTracker.getUserId();

        if (currentUser != mCurrentUser) {

            mUserContext = mUserTracker.getUserContext();
@@ -349,7 +341,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
        if (newTiles.isEmpty() && !tileSpecs.isEmpty()) {

            // If we didn't manage to create any tiles, set it to empty (default)

            Log.d(TAG, "No valid tiles on tuning changed. Setting to default.");

            changeTiles(currentSpecs, loadTileSpecs(mContext, "", mStatusBarFlags));

            changeTiles(currentSpecs, loadTileSpecs(mContext, ""));

        } else {

            for (int i = 0; i < mCallbacks.size(); i++) {

                mCallbacks.get(i).onTilesChanged();
@@ -417,7 +409,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 


    private void changeTileSpecs(Predicate<List<String>> changeFunction) {

        final String setting = mSecureSettings.getStringForUser(TILES_SETTING, mCurrentUser);

        final List<String> tileSpecs = loadTileSpecs(mContext, setting, mStatusBarFlags);

        final List<String> tileSpecs = loadTileSpecs(mContext, setting);

        if (changeFunction.test(tileSpecs)) {

            saveTilesToSettings(tileSpecs);

        }
@@ -506,8 +498,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
        throw new RuntimeException("Default factory didn't create view for " + tile.getTileSpec());

    }



    protected static List<String> loadTileSpecs(

            Context context, String tileList, StatusBarFlags statusBarFlags) {

    protected static List<String> loadTileSpecs(Context context, String tileList) {

        final Resources res = context.getResources();



        if (TextUtils.isEmpty(tileList)) {
@@ -540,7 +531,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
                }

            }

        }

        if (statusBarFlags.isProviderModelSettingEnabled()) {



        if (!tiles.contains("internet")) {

            if (tiles.contains("wifi")) {

                // Replace the WiFi with Internet, and remove the Cell
@@ -554,7 +545,6 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 
            tiles.remove("wifi");

            tiles.remove("cell");

        }

        }

        return tiles;

    }

packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java

+3 −9
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.systemui.qs.dagger.QSScope; 
import com.android.systemui.qs.external.CustomTile;

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

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.connectivity.StatusBarFlags;

import com.android.systemui.util.leak.GarbageMonitor;



import java.util.ArrayList;
@@ -63,7 +62,6 @@ public class TileQueryHelper { 
    private final Executor mBgExecutor;

    private final Context mContext;

    private final UserTracker mUserTracker;

    private final StatusBarFlags mStatusBarFlags;

    private TileStateListener mListener;



    private boolean mFinished;
@@ -73,14 +71,12 @@ public class TileQueryHelper { 
            Context context,

            UserTracker userTracker,

            @Main Executor mainExecutor,

            @Background Executor bgExecutor,

            StatusBarFlags statusBarFlags

            @Background Executor bgExecutor

    ) {

        mContext = context;

        mMainExecutor = mainExecutor;

        mBgExecutor = bgExecutor;

        mUserTracker = userTracker;

        mStatusBarFlags = statusBarFlags;

    }



    public void setListener(TileStateListener listener) {
@@ -121,10 +117,8 @@ public class TileQueryHelper { 
        }



        final ArrayList<QSTile> tilesToAdd = new ArrayList<>();

        if (mStatusBarFlags.isProviderModelSettingEnabled()) {

        possibleTiles.remove("cell");

        possibleTiles.remove("wifi");

        }



        for (String spec : possibleTiles) {

            // Only add current and stock tiles that can be created from QSFactoryImpl.

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogUtil.java

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
package com.android.systemui.qs.tiles.dialog;



import android.content.Context;

import android.util.FeatureFlagUtils;



public class InternetDialogUtil {



    public static boolean isProviderModelEnabled(Context context) {

        if (context == null) {

            return false;

        }

        return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);

    }

}