diff --git a/res/layout/mobile_network_settings_container_v2.xml b/res/layout/mobile_network_settings_container_v2.xml new file mode 100644 index 00000000000..ed7296b39ae --- /dev/null +++ b/res/layout/mobile_network_settings_container_v2.xml @@ -0,0 +1,39 @@ + + + + + + + + + + diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java index c101db4b095..93ba9180310 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java +++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java @@ -37,7 +37,9 @@ import androidx.fragment.app.FragmentTransaction; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.util.CollectionUtils; import com.android.settings.R; +import com.android.settings.core.FeatureFlags; import com.android.settings.core.SettingsBaseActivity; +import com.android.settings.development.featureflags.FeatureFlagPersistent; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -77,7 +79,11 @@ public class MobileNetworkActivity extends SettingsBaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.mobile_network_settings_container); + if (FeatureFlagPersistent.isEnabled(this, FeatureFlags.NETWORK_INTERNET_V2)) { + setContentView(R.layout.mobile_network_settings_container_v2); + } else { + setContentView(R.layout.mobile_network_settings_container); + } setActionBar(findViewById(R.id.mobile_action_bar)); mPhoneChangeReceiver = new PhoneChangeReceiver(); mSubscriptionManager = getSystemService(SubscriptionManager.class); @@ -132,7 +138,9 @@ public class MobileNetworkActivity extends SettingsBaseActivity { void updateSubscriptions(Bundle savedInstanceState) { mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList(); - updateBottomNavigationView(); + if (!FeatureFlagPersistent.isEnabled(this, FeatureFlags.NETWORK_INTERNET_V2)) { + updateBottomNavigationView(); + } if (savedInstanceState == null) { switchFragment(new MobileNetworkSettings(), getSubscriptionId()); @@ -237,4 +245,4 @@ public class MobileNetworkActivity extends SettingsBaseActivity { } } } -} \ No newline at end of file +}