diff --git a/res/values/strings.xml b/res/values/strings.xml
index 14d205bb79e..6401114ead5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12346,6 +12346,16 @@
Off
+
+ Internet
+
+ SIMs
+
+ Airplane-safe networks
+
+ Find and connect to airplane\u2011safe networks
+
+ airplane, airplane-safe
Calls & SMS
diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml
new file mode 100644
index 00000000000..3e798ab1293
--- /dev/null
+++ b/res/xml/network_provider_internet.xml
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index 76d60e537f2..ad901ee603d 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -21,6 +21,7 @@ import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
+import android.util.FeatureFlagUtils;
import android.util.Log;
import androidx.appcompat.app.AlertDialog;
@@ -57,14 +58,20 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override
protected int getPreferenceScreenResId() {
- return R.xml.network_and_internet;
+ if (isProviderModelEnabled(getContext())) {
+ return R.xml.network_provider_internet;
+ } else {
+ return R.xml.network_and_internet;
+ }
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
- use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
+ if (!isProviderModelEnabled(context)) {
+ use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
+ }
use(AirplaneModePreferenceController.class).setFragment(this);
getSettingsLifecycle().addObserver(use(AllInOneTetherPreferenceController.class));
}
@@ -164,4 +171,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements
null /* mobilePlanHost */);
}
};
+
+ private static boolean isProviderModelEnabled(Context context) {
+ return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
+ }
}