From 627f14bfd041408b4cfd49ae4557f0048c5f5a6e Mon Sep 17 00:00:00 2001 From: Antony Sargent Date: Mon, 4 Mar 2019 16:00:59 -0800 Subject: [PATCH] Disable the "SIM cards" tile in new Network & internet page When settings_network_and_internet_v2 is enabled, don't show the old "SIM cards" tile for managing multiple SIM cards on the Network & internet page, since we now have new UI for this. Bug: 116349402 Test: manual (put device into dual-sim dual-standby mode, and enable the 'settings_network_and_internet_v2' flag in the FeatureFlags section of Developer options) Change-Id: Icc0d723b634f15ad831e38b783ae226a7717f674 --- src/com/android/settings/Utils.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 69b8c569a60..a93fb76f2c8 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -98,6 +98,8 @@ import androidx.preference.PreferenceGroup; import com.android.internal.app.UnlaunchableAppActivity; import com.android.internal.util.ArrayUtils; import com.android.internal.widget.LockPatternUtils; +import com.android.settings.core.FeatureFlags; +import com.android.settings.development.featureflags.FeatureFlagPersistent; import com.android.settings.password.ChooseLockSettingsHelper; import java.net.InetAddress; @@ -513,6 +515,9 @@ public final class Utils extends com.android.settingslib.Utils { * TODO: See bug 16533525. */ public static boolean showSimCardTile(Context context) { + if (FeatureFlagPersistent.isEnabled(context, FeatureFlags.NETWORK_INTERNET_V2)) { + return false; + } final TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);