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

Commit 532c3d72 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make Network & internet v2 feature flag be persistent"

parents d7195194 0a830d4f

src/com/android/settings/development/featureflags/FeatureFlagPersistent.java

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class FeatureFlagPersistent { 
    static {

        PERSISTENT_FLAGS = new HashSet<>();

        PERSISTENT_FLAGS.add(FeatureFlags.HEARING_AID_SETTINGS);

        PERSISTENT_FLAGS.add(FeatureFlags.NETWORK_INTERNET_V2);

    }



    public static boolean isEnabled(Context context, String feature) {

src/com/android/settings/network/NetworkDashboardFragment.java

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.settings.network.MobilePlanPreferenceController 
import android.app.Dialog;

import android.content.Context;

import android.provider.SearchIndexableResource;

import android.util.FeatureFlagUtils;

import android.util.Log;



import androidx.appcompat.app.AlertDialog;
@@ -31,6 +30,7 @@ import com.android.internal.logging.nano.MetricsProto; 
import com.android.settings.R;

import com.android.settings.core.FeatureFlags;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.development.featureflags.FeatureFlagPersistent;

import com.android.settings.network.MobilePlanPreferenceController.MobilePlanPreferenceHost;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
@@ -61,7 +61,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements 


    @Override

    protected int getPreferenceScreenResId() {

        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {

        if (FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {

            return R.xml.network_and_internet_v2;

        } else {

            return R.xml.network_and_internet;
@@ -72,7 +72,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements 
    public void onAttach(Context context) {

        super.onAttach(context);



        if (FeatureFlagUtils.isEnabled(context, FeatureFlags.NETWORK_INTERNET_V2)) {

        if (FeatureFlagPersistent.isEnabled(context, FeatureFlags.NETWORK_INTERNET_V2)) {

            use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());

        }

        use(AirplaneModePreferenceController.class).setFragment(this);