am b2e99976: am 2300b082: Merge "1) Using Sprint-specific apns-conf.xml (/system/etc/apns-conf.xml)"

* commit 'b2e99976690e5ea18c787bcda6697fe94d8a7493':
  1) Using Sprint-specific apns-conf.xml (/system/etc/apns-conf.xml)

3 files changed, 211 insertions, 184 deletions

diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
index 061c12c..4df4015 100755..100644
--- a/overlay/packages/apps/Settings/res/values/bools.xml
+++ b/overlay/packages/apps/Settings/res/values/bools.xml
@@ -15,6 +15,21 @@
 -->
 
 <resources>
-    <!-- Additional System Update menu(Update PRL, Update Profile) is displayed if it is true -->
+    <!-- Whether or not the dock settings are to be displayed for this device when docked -->
+    <bool name="has_dock_settings">false</bool>
+    <!-- Whether there is a silent mode checkbox  -->
+    <bool name="has_silent_mode">true</bool>
+    <!-- Whether the power control widget is enabled for this device. Should be overridden for
+         specific product builds. -->
+    <bool name="has_powercontrol_widget">true</bool>
+
+    <!-- Display additional System Update menu if true -->
     <bool name="config_additional_system_update_setting_enable">true</bool>
+
+    <!-- Whether the bluetooth activation confirmation dialogs should be auto dismissed.
+         Can be overridden for specific product builds. -->
+    <bool name="auto_confirm_bluetooth_activation_dialog">false</bool>
+
+    <!-- Whether User management screen is available -->
+    <bool name="enable_user_management">false</bool>
 </resources>
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
index 723df12..8f4c946 100755..100644
--- a/overlay/packages/apps/Settings/res/values/config.xml
+++ b/overlay/packages/apps/Settings/res/values/config.xml
@@ -15,6 +15,18 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="additional_system_update">com.samsung.sdm</string>
-    <string name="additional_system_update_menu">com.samsung.sdm.ui.SprintUpdateSetting</string>
+
+    <!-- If false, MIN is displayed. If true, MSID is displayed. -->
+    <bool name="config_msid_enable" translatable="false">false</bool>
+
+    <string name="additional_system_update" translatable="false">com.samsung.sdm</string>
+    <string name="additional_system_update_menu" translatable="false">com.samsung.sdm.ui.SprintUpdateSetting</string>
+
+    <!-- TODO: This is purely enforced by the interface, and does not affect what
+         strings may be inserted into the actual content provider.
+         With the addition of shortcuts, it seems more likely that users will
+         find this limiting; it would be good to have the interface work with
+         very long strings too. -->
+    <integer name="maximum_user_dictionary_word_length" translatable="false">48</integer>
+
 </resources>
diff --git a/test-apns-conf_sprint.xml b/test-apns-conf_sprint.xml
index 55e7643..45f9cb8 100755..100644
--- a/test-apns-conf_sprint.xml
+++ b/test-apns-conf_sprint.xml
@@ -1,181 +1,181 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-/*

-** Copyright 2006, Google Inc.

-**

-** 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.

-*/

--->

-

-<!-- use empty string to specify no proxy or port -->

-<!-- This version must agree with that in apps/common/res/apns.xml -->

-<apns version="7">

-    <!-- Start of Apn database for Sprint LTE support -->

-    <apn carrier="ota"

-        mcc="310"

-        mnc="120"

-        apn="otasn"

-        type="fota"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="14"

-    />

-

-    <apn carrier="LTE - SPRINT test ISP"

-        mcc="001"

-        mnc="010"

-        apn="n.ispsn"

-        type="default, mms"

-        mmsc="http://mms.sprintpcs.com"

-        mmsproxy = "68.28.31.7"

-        mmsport = "80"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="14"

-    />

-

-    <apn carrier="LTE - SPRINT test OTA"

-        mcc="001"

-        mnc="010"

-        apn="otasn"

-        type="fota"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="14"

-    />

-

-    <apn carrier="LTE - SPRINT test PAM"

-        mcc="001"

-        mnc="010"

-        apn="pamsn"

-        type="dun"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="14"

-    />

-

-    <apn carrier="LTE - SPRINT test ISP"

-        mcc="001"

-        mnc="01"

-        apn="n.ispsn"

-        type="default, mms"

-        mmsc="http://mms.sprintpcs.com"

-        mmsproxy = "68.28.31.7"

-        mmsport = "80"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="14"

-    />

-

-    <apn carrier="LTE - SPRINT test OTA"

-        mcc="001"

-        mnc="01"

-        apn="otasn"

-        type="fota"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="14"

-    />

-

-    <apn carrier="LTE - SPRINT test PAM"

-        mcc="001"

-        mnc="01"

-        apn="pamsn"

-        type="dun"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="14"

-    />

-

-    <!-- End of Apn database for Sprint LTE support -->

-

-    <!-- Start of Apn database for Sprint EHRPD support -->

-    <apn carrier="ota"

-        mcc="310"

-        mnc="120"

-        apn="otasn"

-        type="fota"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="13"

-    />

-

-    <apn carrier="EHRPD - SPRINT test ISP"

-        mcc="001"

-        mnc="010"

-        apn="n.ispsn"

-        type="default, mms"

-        mmsc="http://mms.sprintpcs.com"

-        mmsproxy = "68.28.31.7"

-        mmsport = "80"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="13"

-    />

-

-    <apn carrier="EHRPD - SPRINT test OTA"

-        mcc="001"

-        mnc="010"

-        apn="otasn"

-        type="fota"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="13"

-    />

-

-    <apn carrier="EHRPD - SPRINT test PAM"

-        mcc="001"

-        mnc="010"

-        apn="pamsn"

-        type="dun"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="13"

-    />

-

-    <apn carrier="EHRPD - SPRINT test ISP"

-        mcc="001"

-        mnc="01"

-        apn="n.ispsn"

-        type="default, mms"

-        mmsc="http://mms.sprintpcs.com"

-        mmsproxy = "68.28.31.7"

-        mmsport = "80"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="13"

-    />

-

-    <apn carrier="EHRPD - SPRINT test OTA"

-        mcc="001"

-        mnc="01"

-        apn="otasn"

-        type="fota"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="13"

-    />

-

-    <apn carrier="EHRPD - SPRINT test PAM"

-        mcc="001"

-        mnc="01"

-        apn="pamsn"

-        type="dun"

-        protocol="IPV4V6"

-        roaming_protocol="IPV4V6"

-        bearer="13"

-    />

-

-    <!-- End of Apn database for Sprint EHRPD support -->

-</apns>

-

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2006, Google Inc.
+**
+** 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.
+*/
+-->
+
+<!-- use empty string to specify no proxy or port -->
+<!-- This version must agree with that in apps/common/res/apns.xml -->
+<apns version="7">
+    <!-- Start of Apn database for Sprint LTE support -->
+    <apn carrier="ota"
+        mcc="310"
+        mnc="120"
+        apn="otasn"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="14"
+    />
+
+    <apn carrier="LTE - SPRINT test ISP"
+        mcc="001"
+        mnc="010"
+        apn="n.ispsn"
+        type="default, mms"
+        mmsc="http://mms.sprintpcs.com"
+        mmsproxy = "68.28.31.7"
+        mmsport = "80"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="14"
+    />
+
+    <apn carrier="LTE - SPRINT test OTA"
+        mcc="001"
+        mnc="010"
+        apn="otasn"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="14"
+    />
+
+    <apn carrier="LTE - SPRINT test PAM"
+        mcc="001"
+        mnc="010"
+        apn="pamsn"
+        type="dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="14"
+    />
+
+    <apn carrier="LTE - SPRINT test ISP"
+        mcc="001"
+        mnc="01"
+        apn="n.ispsn"
+        type="default, mms"
+        mmsc="http://mms.sprintpcs.com"
+        mmsproxy = "68.28.31.7"
+        mmsport = "80"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="14"
+    />
+
+    <apn carrier="LTE - SPRINT test OTA"
+        mcc="001"
+        mnc="01"
+        apn="otasn"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="14"
+    />
+
+    <apn carrier="LTE - SPRINT test PAM"
+        mcc="001"
+        mnc="01"
+        apn="pamsn"
+        type="dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="14"
+    />
+
+    <!-- End of Apn database for Sprint LTE support -->
+
+    <!-- Start of Apn database for Sprint EHRPD support -->
+    <apn carrier="ota"
+        mcc="310"
+        mnc="120"
+        apn="otasn"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+
+    <apn carrier="EHRPD - SPRINT test ISP"
+        mcc="001"
+        mnc="010"
+        apn="n.ispsn"
+        type="default, mms"
+        mmsc="http://mms.sprintpcs.com"
+        mmsproxy = "68.28.31.7"
+        mmsport = "80"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+
+    <apn carrier="EHRPD - SPRINT test OTA"
+        mcc="001"
+        mnc="010"
+        apn="otasn"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+
+    <apn carrier="EHRPD - SPRINT test PAM"
+        mcc="001"
+        mnc="010"
+        apn="pamsn"
+        type="dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+
+    <apn carrier="EHRPD - SPRINT test ISP"
+        mcc="001"
+        mnc="01"
+        apn="n.ispsn"
+        type="default, mms"
+        mmsc="http://mms.sprintpcs.com"
+        mmsproxy = "68.28.31.7"
+        mmsport = "80"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+
+    <apn carrier="EHRPD - SPRINT test OTA"
+        mcc="001"
+        mnc="01"
+        apn="otasn"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+
+    <apn carrier="EHRPD - SPRINT test PAM"
+        mcc="001"
+        mnc="01"
+        apn="pamsn"
+        type="dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="13"
+    />
+
+    <!-- End of Apn database for Sprint EHRPD support -->
+</apns>
+