From 33340366aa5270358c54538de38bd20f7d2cdf74 Mon Sep 17 00:00:00 2001
From: Antony Sargent <asargent@google.com>
Date: Mon, 14 Jan 2019 17:38:25 -0800
Subject: [PATCH] Remove the multi-SIM bottom nav in network and internet v2
 mode

When a device has multiple SIMs, at the bottom of the SIM details page
we show a chooser with an icon for each SIM card. This UX design is
being supplanted by the new network and internet v2 design where there
is a list of networks you can get to from the Network & internet
homepage. So when the v2 mode is turned on, we don't want that bottom
navigation to appear.

Bug: 116349402
Test: visual (will remove existing tests for this feature eventually)
Change-Id: I9cae479a1f4e689adcc4f4262661b10edbbbf2d3
---
 .../mobile_network_settings_container_v2.xml  | 39 +++++++++++++++++++
 .../telephony/MobileNetworkActivity.java      | 14 +++++--
 2 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 res/layout/mobile_network_settings_container_v2.xml

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2019 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"/>
+
+</LinearLayout>
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
+}