commit 6f9f5c0dab02ee56dadbdf5e25502bd8af78f7dc
author Sungmin Choi <sungmin.choi@lge.com> Thu Nov 05 14:38:35 2015 +0900
committer Vineeta Srivastava <vsrivastava@google.com> Thu Dec 03 13:30:37 2015 -0800
tree a16c27830a5e7ff2791e7acdda7ec9728318bdf2
parent 00f5b5b3353d18aece46bacfc08b3d9373f986a0

Remove TDSCDMA-only menu

Bug: 25516374
Change-Id: I2a39ad20df43ade23e538bbedc31f445c2e17aff

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d71025d..4f57018 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -596,7 +596,6 @@
     <string name="network_2G" translatable="false">2G</string>
     <string name="network_1x" translatable="false">1x</string>
     <string name="network_global">Global</string>
-    <string name="network_tdscdma">TDSCDMA Only</string>
 
     <string-array name="enabled_networks_except_gsm_choices" translatable="false">
         <item>@string/network_lte</item>
@@ -678,13 +677,11 @@
         <item>@string/network_lte</item>
         <item>@string/network_3G</item>
         <item>@string/network_2G</item>
-        <item>@string/network_tdscdma</item>
     </string-array>
     <string-array name="enabled_networks_tdscdma_values" translatable="false">
         <item>"22"</item>
         <item>"18"</item>
         <item>"1"</item>
-        <item>"13"</item>
     </string-array>
 
     <!-- CDMA System select strings -->

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index c94bf4c..59aa9a1 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -1163,7 +1163,7 @@
             case Phone.NT_MODE_TDSCDMA_ONLY:
                 mButtonEnabledNetworks.setValue(
                         Integer.toString(Phone.NT_MODE_TDSCDMA_ONLY));
-                mButtonEnabledNetworks.setSummary(R.string.network_tdscdma);
+                mButtonEnabledNetworks.setSummary(R.string.network_3G);
                 break;
             case Phone.NT_MODE_LTE_TDSCDMA_GSM:
             case Phone.NT_MODE_LTE_TDSCDMA_GSM_WCDMA: