t0lte: cdma overlays: enable world phone and network modes and update DeviceSettings

Change-Id: Iec4c45b8e347c2c7697c884f1e89441eb9b0d48c

4 files changed, 48 insertions, 4 deletions

diff --git a/overlay-cdma/device/samsung/smdk4412-common/DeviceSettings/res/values/config.xml b/overlay-cdma/device/samsung/smdk4412-common/DeviceSettings/res/values/config.xml
index 74f963a..e19b02c 100644
--- a/overlay-cdma/device/samsung/smdk4412-common/DeviceSettings/res/values/config.xml
+++ b/overlay-cdma/device/samsung/smdk4412-common/DeviceSettings/res/values/config.xml
@@ -21,4 +21,7 @@
     <bool name="has_incall_audio_tuning">true</bool>
     <bool name="has_output_audio_tuning">true</bool>
 
+    <!-- HSPA -->
+    <bool name="has_hspa">false</bool>
+
 </resources>
diff --git a/overlay-cdma/frameworks/base/core/res/res/values/config.xml b/overlay-cdma/frameworks/base/core/res/res/values/config.xml
index e95be49..8fbd8e0 100755
--- a/overlay-cdma/frameworks/base/core/res/res/values/config.xml
+++ b/overlay-cdma/frameworks/base/core/res/res/values/config.xml
@@ -61,7 +61,7 @@
          be empty.  An example would be "usb.*" -->
     <string-array translatable="false" name="config_tether_usb_regexs">
         <item>"usb0"</item>
-		<item>"rndis0"</item>
+        <item>"rndis0"</item>
     </string-array>
 	
     <integer-array name="config_data_usage_network_types">
@@ -70,17 +70,17 @@
         <item>3</item>
         <item>4</item>
         <item>5</item>
-    </integer-array>
+      </integer-array>
 
     <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
     <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
     <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
-    <integer-array translatable="false" name="config_tether_upstream_types">
+     <integer-array translatable="false" name="config_tether_upstream_types">
         <item>0</item>
         <item>1</item>
         <item>5</item>
         <item>7</item>
-    </integer-array>
+      </integer-array>
     
     <!-- If the DUN connection for this CDMA device supports more than just DUN -->
     <!-- traffic you should list them here. -->
diff --git a/overlay-cdma/packages/apps/Phone/res/values/config.xml b/overlay-cdma/packages/apps/Phone/res/values/config.xml
index 92c6912..70de999 100755
--- a/overlay-cdma/packages/apps/Phone/res/values/config.xml
+++ b/overlay-cdma/packages/apps/Phone/res/values/config.xml
@@ -41,4 +41,7 @@
     <!-- Determine whether we should show the "listen for instructions" screen after
          successfully placing the OTA call -->
     <integer name="OtaShowListeningScreen">1</integer>
+
+    <!-- Flag indicating if the phone is a world phone -->
+    <bool name="world_phone">true</bool>
 </resources>
diff --git a/overlay-cdma/packages/apps/Phone/res/xml/network_mode.xml b/overlay-cdma/packages/apps/Phone/res/xml/network_mode.xml
new file mode 100644
index 0000000..38989fe
--- /dev/null
+++ b/overlay-cdma/packages/apps/Phone/res/xml/network_mode.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Mobile network settings, network mode choices for a device supporting CDMA and LTE [CHAR LIMIT=25] -->
+    <string-array name="preferred_network_mode_choices">
+        <item>LTE/CDMA/EvDo/GSM/WCDMA</item>
+        <item>LTE/GSM/WCDMA</item>
+        <item>LTE/CDMA/EvDo</item>
+        <item>CDMA/EvDo auto</item>
+        <item>GSM/WCDMA auto</item>
+        <item>GSM/WCDMA preferred</item>
+    </string-array>
+    <string-array name="preferred_network_mode_values" translatable="false">
+        <item>"10"</item>
+        <item>"9"</item>
+        <item>"8"</item>
+        <item>"4"</item>
+        <item>"3"</item>
+        <item>"0"</item>
+    </string-array>
+
+    <!-- LTE/CDMA network mode to use for toggleLTE(true). -->
+    <integer name="toggleLTE_lte_cdma_nt_mode">8</integer>
+</resources>