From 675122ad518718679f1abc41ac914e88f942765a Mon Sep 17 00:00:00 2001
From: pkanwar <pkanwar@google.com>
Date: Sun, 11 Dec 2016 15:36:34 -0800
Subject: [PATCH] DO NOT MERGE: Add UI toggle to control connections to carrier
 networks.

Bug: 31003437
Change-Id: Ieb6dfc0dc989068e151a1d0e376f56f67c9790b2
---
 res/values/strings.xml                             |  4 ++++
 res/xml/wifi_configure_settings.xml                |  5 +++++
 .../settings/wifi/ConfigureWifiSettings.java       | 14 ++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4e5f7c726d4..10f0fe0c4ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1599,6 +1599,10 @@
     <string name="wifi_setting_on_during_sleep_title">Wi\u2011Fi on during sleep</string>
     <!-- Generic error message when the sleep policy could not be set. -->
     <string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string>
+    <!-- Checkbox title for option to toggle connecting to carrier networks[CHAR LIMIT=30] -->
+    <string name="wifi_connect_carrier_networks">Connect to operator networks</string>
+    <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+    <string name="wifi_connect_carrier_networks_summary">Connect to operator networks when available</string>
     <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
     <string name="wifi_suspend_efficiency_title">Improve efficiency</string>
     <!-- Checkbox title for option to toggle suspend power optimizations -->
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index 863007c724f..77018ea5f7f 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -29,6 +29,11 @@
         android:title="@string/wifi_notify_open_networks"
         android:summary="@string/wifi_notify_open_networks_summary" />
 
+    <SwitchPreference
+        android:key="connect_carrier_networks"
+        android:title="@string/wifi_connect_carrier_networks"
+        android:summary="@string/wifi_connect_carrier_networks_summary" />
+
     <ListPreference
         android:key="sleep_policy"
         android:title="@string/wifi_setting_sleep_policy_title"
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 077d601bd5b..712b19e740b 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -54,6 +54,7 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
     private static final String KEY_SLEEP_POLICY = "sleep_policy";
     private static final String KEY_CELLULAR_FALLBACK = "wifi_cellular_data_fallback";
     private static final String KEY_WIFI_ASSISTANT = "wifi_assistant";
+    private static final String KEY_CONNECT_CARRIER_NETWORKS = "connect_carrier_networks";
 
     private WifiManager mWifiManager;
     private NetworkScoreManager mNetworkScoreManager;
@@ -98,12 +99,21 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
             removePreference(KEY_SAVED_NETWORKS);
         }
 
+        if (!mWifiManager.hasCarrierConfiguredNetworks()){
+            removePreference(KEY_CONNECT_CARRIER_NETWORKS);
+        }
+
         SwitchPreference notifyOpenNetworks =
                 (SwitchPreference) findPreference(KEY_NOTIFY_OPEN_NETWORKS);
         notifyOpenNetworks.setChecked(Settings.Global.getInt(getContentResolver(),
                 Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
         notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
 
+        SwitchPreference connectToCarrierNetworks =
+                (SwitchPreference) findPreference(KEY_CONNECT_CARRIER_NETWORKS);
+        connectToCarrierNetworks.setChecked(Settings.Global.getInt(getContentResolver(),
+                Settings.Global.WIFI_CONNECT_CARRIER_NETWORKS, 0) == 1);
+
         final Context context = getActivity();
         if (avoidBadWifiConfig()) {
             // Hide preference toggle, always avoid bad wifi networks.
@@ -187,6 +197,10 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
             String settingName = Settings.Global.NETWORK_AVOID_BAD_WIFI;
             Settings.Global.putString(getContentResolver(), settingName,
                     ((SwitchPreference) preference).isChecked() ? "1" : null);
+        } else if (KEY_CONNECT_CARRIER_NETWORKS.equals(key)) {
+            Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.WIFI_CONNECT_CARRIER_NETWORKS,
+                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
         } else {
             return super.onPreferenceTreeClick(preference);
         }