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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16475177

Change-Id: I759453090ac063dc4d8c79c1a18bcfb2cd861871

src/com/android/settings/Utils.java

@@ -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

@@ -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
+        final Preference unnecessaryWarningPreference = findPreference("operator_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");
         if (unnecessaryWarningPreference != null) {
             unnecessaryWarningPreference.setVisible(false);
         }

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

@@ -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));
-            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) {
+            new BaseSearchIndexProvider(R.xml.network_provider_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);
-                }
-
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(Context
                         context) {

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

@@ -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);
-            getActivity().setTitle(R.string.network_and_internet_preferences_title);
-        }
 
         mCertinstallerPreference = findPreference(KEY_INSTALL_CREDENTIALS);
         if (mCertinstallerPreference != null) {