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

Commit ad79a181 authored by Zoey Chen's avatar Zoey Chen
Browse files

[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.4 

Test: atest NetworkDashboardFragmentTest
Bug: 197066557
Change-Id: I9781af3a53fe7050b414f0574abb7618f8d71707
parent 4ae25ef5

src/com/android/settings/Utils.java

+0 −4
Original line number Diff line number Diff line
@@ -1230,8 +1230,4 @@ public final class Utils extends com.android.settingslib.Utils { 
    public static int getHomepageIconColorHighlight(Context context) {

        return getColorAttrDefaultColor(context, android.R.attr.textColorSecondaryInverse);

    }



    public static boolean isProviderModelEnabled(Context context) {

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

    }

}

src/com/android/settings/datausage/DataUsageList.java

+1 −6
Original line number Diff line number Diff line
@@ -142,12 +142,7 @@ public class DataUsageList extends DataUsageBaseFragment 
        mChart = findPreference(KEY_CHART_DATA);

        mApps = findPreference(KEY_APPS_GROUP);



        // TODO(b/167474581): This is a temporary solution to hide unnecessary warning

        //  preference, when the provider model is completed, the following code should be removed.

        final Preference unnecessaryWarningPreference =

                FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)

                        ? findPreference("operator_warning")

                        : findPreference("non_carrier_data_usage_warning");

        final Preference unnecessaryWarningPreference = findPreference("operator_warning");

        if (unnecessaryWarningPreference != null) {

            unnecessaryWarningPreference.setVisible(false);

        }

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

+2 −17
Original line number Diff line number Diff line
@@ -118,9 +118,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements 
            controllers.add(internetPreferenceController);

        }

        controllers.add(privateDnsPreferenceController);

        if (Utils.isProviderModelEnabled(context)) {

        controllers.add(new NetworkProviderCallsSmsController(context, lifecycle));

        }

        return controllers;

    }
@@ -155,20 +153,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements 
    }



    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.network_and_internet) {



                @Override

                // TODO(b/167474581): Should remove this method when Provider Model finished.

                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,

                        boolean enabled) {

                    if (Utils.isProviderModelEnabled(context)) {

                        final SearchIndexableResource sir = new SearchIndexableResource(context);

                        sir.xmlResId = R.xml.network_provider_internet;

                        return Arrays.asList(sir);

                    }

                    return super.getXmlResourcesToIndex(context, enabled);

                }



            new BaseSearchIndexProvider(R.xml.network_provider_internet) {

                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(Context

                        context) {

src/com/android/settings/wifi/ConfigureWifiSettings.java

+1 −3
Original line number Diff line number Diff line
@@ -58,9 +58,7 @@ public class ConfigureWifiSettings extends DashboardFragment { 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {

        getActivity().setTitle(R.string.network_and_internet_preferences_title);

        }



        mCertinstallerPreference = findPreference(KEY_INSTALL_CREDENTIALS);

        if (mCertinstallerPreference != null) {