commit e7e50d95342e16f54ebc4fb5e7cc852770ba8454
author Sungmin Choi <sungmin.choi@lge.com> Sat Dec 05 00:54:52 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 05 00:54:52 2015 +0000
tree f75530bc0367472d755b53918f83cef5abf730a8
parent 05d57b3570b26a9d6fad53e6d327f03c71d95eea
parent 7ac859ca37f0ee203ec5b77941fe83587dc303bf

Remove TDSCDMA-only menu am: 6f9f5c0dab
am: 7ac859ca37

* commit '7ac859ca37f0ee203ec5b77941fe83587dc303bf':
  Remove TDSCDMA-only menu

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ba13365..0d5f42e 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 b470398..2522611 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: