Merge "[Settings] Remove mobile network v1" am: 10799d12fd
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
diff --git a/res/layout/mobile_network_settings_container.xml b/res/layout/mobile_network_settings_container.xml
deleted file mode 100644
index c88b512..0000000
--- a/res/layout/mobile_network_settings_container.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2018 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <Toolbar
- android:id="@+id/mobile_action_bar"
- style="?android:attr/actionBarStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:navigationContentDescription="@*android:string/action_bar_up_description"
- android:theme="?android:attr/actionBarTheme"/>
-
- <FrameLayout
- android:id="@+id/main_content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"/>
-
- <com.google.android.material.bottomnavigation.BottomNavigationView
- android:id="@+id/bottom_nav"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_marginEnd="0dp"
- android:layout_marginStart="0dp"
- android:background="?android:attr/windowBackground"
- app:itemIconTint="@color/bottom_navigation_colors"
- app:itemTextColor="@color/bottom_navigation_colors"
- app:menu="@menu/home_bottom_navigation"/>
-</LinearLayout>
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index 8c686a5..4669e74 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -27,9 +27,7 @@
import androidx.fragment.app.Fragment;
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;
@@ -60,20 +58,14 @@
@Override
protected int getPreferenceScreenResId() {
- if (FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {
- return R.xml.network_and_internet_v2;
- } else {
- return R.xml.network_and_internet;
- }
+ return R.xml.network_and_internet_v2;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
- if (FeatureFlagPersistent.isEnabled(context, FeatureFlags.NETWORK_INTERNET_V2)) {
- use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
- }
+ use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
use(AirplaneModePreferenceController.class).setFragment(this);
}
@@ -95,10 +87,6 @@
new MobilePlanPreferenceController(context, mobilePlanHost);
final WifiMasterSwitchPreferenceController wifiPreferenceController =
new WifiMasterSwitchPreferenceController(context, metricsFeatureProvider);
- MobileNetworkPreferenceController mobileNetworkPreferenceController = null;
- if (!FeatureFlagPersistent.isEnabled(context, FeatureFlags.NETWORK_INTERNET_V2)) {
- mobileNetworkPreferenceController = new MobileNetworkPreferenceController(context);
- }
final VpnPreferenceController vpnPreferenceController =
new VpnPreferenceController(context);
@@ -108,21 +96,13 @@
if (lifecycle != null) {
lifecycle.addObserver(mobilePlanPreferenceController);
lifecycle.addObserver(wifiPreferenceController);
- if (mobileNetworkPreferenceController != null) {
- lifecycle.addObserver(mobileNetworkPreferenceController);
- }
lifecycle.addObserver(vpnPreferenceController);
lifecycle.addObserver(privateDnsPreferenceController);
}
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- if (FeatureFlagPersistent.isEnabled(context, FeatureFlags.NETWORK_INTERNET_V2)) {
- controllers.add(new MobileNetworkSummaryController(context, lifecycle));
- }
- if (mobileNetworkPreferenceController != null) {
- controllers.add(mobileNetworkPreferenceController);
- }
+ controllers.add(new MobileNetworkSummaryController(context, lifecycle));
controllers.add(new TetherPreferenceController(context, lifecycle));
controllers.add(vpnPreferenceController);
controllers.add(new ProxyPreferenceController(context));
@@ -168,12 +148,7 @@
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
- if (FeatureFlagPersistent.isEnabled(context,
- FeatureFlags.NETWORK_INTERNET_V2)) {
- sir.xmlResId = R.xml.network_and_internet_v2;
- } else {
- sir.xmlResId = R.xml.network_and_internet;
- }
+ sir.xmlResId = R.xml.network_and_internet_v2;
return Arrays.asList(sir);
}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 90b73f8..c47b29b 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -28,8 +28,6 @@
import android.telephony.SubscriptionManager;
import android.telephony.ims.ImsRcsManager;
import android.text.TextUtils;
-import android.view.Menu;
-import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
@@ -40,13 +38,9 @@
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.android.settings.network.SubscriptionUtil;
-import com.google.android.material.bottomnavigation.BottomNavigationView;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -114,11 +108,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if (FeatureFlagPersistent.isEnabled(this, FeatureFlags.NETWORK_INTERNET_V2)) {
- setContentView(R.layout.mobile_network_settings_container_v2);
- } else {
- setContentView(R.layout.mobile_network_settings_container);
- }
+ setContentView(R.layout.mobile_network_settings_container_v2);
setActionBar(findViewById(R.id.mobile_action_bar));
mPhoneChangeReceiver = new PhoneChangeReceiver(this, new PhoneChangeReceiver.Client() {
@Override
@@ -186,10 +176,6 @@
mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList(true);
- if (!FeatureFlagPersistent.isEnabled(this, FeatureFlags.NETWORK_INTERNET_V2)) {
- updateBottomNavigationView();
- }
-
if (savedInstanceState == null) {
switchFragment(new MobileNetworkSettings(), getSubscriptionId());
}
@@ -244,28 +230,6 @@
}
@VisibleForTesting
- void updateBottomNavigationView() {
- final BottomNavigationView navigation = findViewById(R.id.bottom_nav);
-
- if (CollectionUtils.size(mSubscriptionInfos) <= 1) {
- navigation.setVisibility(View.GONE);
- } else {
- final Menu menu = navigation.getMenu();
- menu.clear();
- for (int i = 0, size = mSubscriptionInfos.size(); i < size; i++) {
- final SubscriptionInfo subscriptionInfo = mSubscriptionInfos.get(i);
- menu.add(0, subscriptionInfo.getSubscriptionId(), i,
- subscriptionInfo.getDisplayName())
- .setIcon(R.drawable.ic_settings_sim);
- }
- navigation.setOnNavigationItemSelectedListener(item -> {
- switchFragment(new MobileNetworkSettings(), item.getItemId());
- return true;
- });
- }
- }
-
- @VisibleForTesting
void switchFragment(Fragment fragment, int subscriptionId) {
switchFragment(fragment, subscriptionId, false /* forceUpdate */);
}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
index 02396dd..94f86f4 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
@@ -22,24 +22,19 @@
import android.content.Context;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
-import android.util.Log;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.FeatureFlags;
-import com.android.settings.development.featureflags.FeatureFlagPersistent;
-import com.android.settings.network.SubscriptionUtil;
-import com.android.settings.network.SubscriptionsChangeListener;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.widget.LayoutPreference;
-
-import java.util.List;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.SubscriptionsChangeListener;
+import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.widget.LayoutPreference;
+
/** This controls a switch to allow enabling/disabling a mobile network */
public class MobileNetworkSwitchController extends BasePreferenceController implements
SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver {
@@ -118,11 +113,8 @@
@Override
public int getAvailabilityStatus() {
- if (FeatureFlagPersistent.isEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2)) {
- return AVAILABLE_UNSEARCHABLE;
- } else {
- return CONDITIONALLY_UNAVAILABLE;
- }
+ return AVAILABLE_UNSEARCHABLE;
+
}
@Override