More fixings for the toro RIL bug.

3 files changed, 18 insertions, 8 deletions

diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/custom_strings.xml b/overlay/frameworks/base/packages/SystemUI/res/values/custom_strings.xml
new file mode 100644
index 0000000..121eb17
--- /dev/null
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/custom_strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- instead of "2G/3G Pref" show "3G/CDMA" -->
+    <string name="network_3G">3G/CDMA</string>
+
+</resources>
diff --git a/overlay/packages/apps/InCallUI/res/values/strings.xml b/overlay/packages/apps/InCallUI/res/values/strings.xml
index 492edae..1f91a05 100644
--- a/overlay/packages/apps/InCallUI/res/values/strings.xml
+++ b/overlay/packages/apps/InCallUI/res/values/strings.xml
@@ -19,11 +19,11 @@
     <string name="cell_broadcast_sms">Emergency Alerts SMS</string>
 
     <!-- Bug in RIL. It believes 7 is CDMA/LTE/EVDO even though that contradicts ril.h -->
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE / CDMA</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: 4G / LTE/string>
 
     <string-array name="preferred_network_mode_choices">
-        <item>LTE/CDMA</item>
-        <item>CDMA</item>
+        <item>4G/LTE</item>
+        <item>3G/CDMA</item>
     </string-array>
     <string-array name="preferred_network_mode_values" translatable="false">
         <item>"7"</item>
diff --git a/overlay/packages/services/Telephony/res/values/strings.xml b/overlay/packages/services/Telephony/res/values/strings.xml
index cd66bbf..ef49d11 100644
--- a/overlay/packages/services/Telephony/res/values/strings.xml
+++ b/overlay/packages/services/Telephony/res/values/strings.xml
@@ -19,11 +19,11 @@
     <string name="cell_broadcast_sms">Emergency Alerts SMS</string>
 
     <!-- Bug in RIL. It believes 7 is CDMA/LTE/EVDO even though that contradicts ril.h -->
-    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE / CDMA</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: 4G / LTE</string>
 
     <string-array name="preferred_network_mode_choices">
-        <item>LTE/CDMA</item>
-        <item>CDMA</item>
+        <item>4G/LTE</item>
+        <item>3G/CDMA</item>
     </string-array>
     <string-array name="preferred_network_mode_values" translatable="false">
         <item>"7"</item>
@@ -31,11 +31,14 @@
     </string-array>
 
     <string-array name="enabled_networks_cdma_choices" translatable="false">
-        <item>LTE</item>
-        <item>3G</item>
+        <item>4G/LTE</item>
+        <item>3G/CDMA</item>
     </string-array>
     <string-array name="enabled_networks_cdma_values" translatable="false">
         <item>"7"</item>
         <item>"4"</item>
     </string-array>
+
+    <string name="network_lte">4G/LTE</string>
+    <string name="network_3G" translatable="false">3G/CDMA</string>
 </resources>