packages_services_telephony_patch

From c01878fffa18de0c40687ae013270323e60e027c Mon Sep 17 00:00:00 2001
From: k2wl <k2wl@github.com>
Date: Sat, 21 Jun 2014 10:03:23 +0530
Subject: [PATCH] s4 mini phone mode in network settings

Change-Id: I865ad67adaaa7b7f46f7b945572a8cc53ca0951b
---
 res/values/cm_arrays.xml                           | 19 -----------
 res/values/strings.xml                             | 38 ----------------------
 .../phone/MSimMobileNetworkSubSettings.java        | 26 +++++----------
 3 files changed, 8 insertions(+), 75 deletions(-)

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index fb329f3..6b5ea90 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -16,25 +16,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string-array name="preferred_network_mode_choices_cm" translatable="false">
-        <item>@string/preferred_network_mode_td_scdma_lte_cdma_evdo_gsm_wcdma</item>
-        <item>@string/preferred_network_mode_td_scdma_cdma_evdo_gsm_wcdma</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma_lte</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma_lte</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_wcdma</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm_lte</item>
-        <item>@string/preferred_network_mode_td_scdma_gsm</item>
-        <item>@string/preferred_network_mode_td_scdma_lte</item>
-        <item>@string/preferred_network_mode_td_scdma_wcdma</item>
-        <item>@string/preferred_network_mode_td_scdma_only</item>
-        <item>@string/preferred_network_mode_lte_wcdma</item>
-        <item>@string/preferred_network_mode_lte</item>
-        <item>@string/preferred_network_mode_global</item>
-        <item>@string/preferred_network_mode_gsm_wcdma_lte</item>
-        <item>@string/preferred_network_mode_cdma_lte_evdo</item>
-        <item>@string/preferred_network_mode_cdma_evdo_gsm_wcdma</item>
-        <item>@string/preferred_network_mode_evdo_only</item>
-        <item>@string/preferred_network_mode_cdma_without_evdo</item>
-        <item>@string/preferred_network_mode_cdma_evdo_auto</item>
         <item>@string/preferred_network_mode_gsm_wcdma_auto</item>
         <item>@string/preferred_network_mode_wcdma_only</item>
         <item>@string/preferred_network_mode_gsm_only</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 65ee972..fed6fe3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -452,50 +452,12 @@
 
 
     <string-array name="preferred_network_mode_choices">
-        <item>TD-SCDMA/LTE/GSM/WCDMA/CDMA/EVDO </item>
-        <item>TD-SCDMA/GSM/WCDMA/CDMA/EVDO </item>
-        <item>TD-SCDMA/GSM/WCDMA/LTE</item>
-        <item>TD-SCDMA/WCDMA/LTE</item>
-        <item>TD-SCDMA/GSM/WCDMA</item>
-        <item>TD-SCDMA/GSM/LTE</item>
-        <item>TD-SCDMA/GSM</item>
-        <item>TD-SCDMA/LTE</item>
-        <item>TD-SCDMA/WCDMA</item>
-        <item>TD-SCDMA only</item>
-        <item>LTE / WCDMA</item>
-        <item>LTE</item>
-        <item>Global</item>
-        <item>GSM/WCDMA/LTE</item>
-        <item>CDMA + LTE/EvDo</item>
-        <item>CDMA/EvDo/GSM/WCDMA</item>
-        <item>EvDo only</item>
-        <item>CDMA w/o EvDo</item>
-        <item>CDMA/EvDo auto</item>
         <item>GSM/WCDMA auto</item>
         <item>WCDMA only</item>
         <item>GSM only</item>
         <item>GSM/WCDMA preferred</item>
     </string-array>
     <string-array name="preferred_network_mode_values"  translatable="false">
-        <item>"22"</item>
-        <item>"21"</item>
-        <item>"20"</item>
-        <item>"19"</item>
-        <item>"18"</item>
-        <item>"17"</item>
-        <item>"16"</item>
-        <item>"15"</item>
-        <item>"14"</item>
-        <item>"13"</item>
-        <item>"12"</item>
-        <item>"11"</item>
-        <item>"10"</item>
-        <item>"9"</item>
-        <item>"8"</item>
-        <item>"7"</item>
-        <item>"6"</item>
-        <item>"5"</item>
-        <item>"4"</item>
         <item>"3"</item>
         <item>"2"</item>
         <item>"1"</item>
diff --git a/src/com/android/phone/MSimMobileNetworkSubSettings.java b/src/com/android/phone/MSimMobileNetworkSubSettings.java
index 720c938..aef17e9 100644
--- a/src/com/android/phone/MSimMobileNetworkSubSettings.java
+++ b/src/com/android/phone/MSimMobileNetworkSubSettings.java
@@ -206,31 +206,21 @@ public class MSimMobileNetworkSubSettings extends PreferenceActivity
         mButtonPreferredNetworkMode = (ListPreference) prefSet.findPreference(
                 BUTTON_PREFERED_NETWORK_MODE);
 
-        boolean isLteOnCdma = mPhone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
-        if (getResources().getBoolean(R.bool.world_phone) == true) {
-            // set the listener for the mButtonPreferredNetworkMode list preference so we can issue
-            // change Preferred Network Mode.
-            mButtonPreferredNetworkMode.setOnPreferenceChangeListener(this);
+        // set the listener for the mButtonPreferredNetworkMode list preference so we can issue
+        // change Preferred Network Mode.
+        mButtonPreferredNetworkMode.setOnPreferenceChangeListener(this);
 
-            //Get the networkMode from Settings.System and displays it
-            int settingsNetworkMode = getPreferredNetworkMode();
-            mButtonPreferredNetworkMode.setValue(Integer.toString(settingsNetworkMode));
+        //Get the networkMode from Settings.System and displays it
+        int settingsNetworkMode = getPreferredNetworkMode();
+        mButtonPreferredNetworkMode.setValue(Integer.toString(settingsNetworkMode));
+
+        if (getResources().getBoolean(R.bool.world_phone) == true) {
             mCdmaOptions = new CdmaOptions(this, prefSet, mPhone);
             mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet, mSubscription);
         } else {
-            if (!isLteOnCdma) {
-                prefSet.removePreference(mButtonPreferredNetworkMode);
-            }
             int phoneType = mPhone.getPhoneType();
             if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
                 mCdmaOptions = new CdmaOptions(this, prefSet, mPhone);
-                if (isLteOnCdma) {
-                    mButtonPreferredNetworkMode.setOnPreferenceChangeListener(this);
-
-                    int settingsNetworkMode = getPreferredNetworkMode();
-                    mButtonPreferredNetworkMode.setValue(
-                            Integer.toString(settingsNetworkMode));
-                }
 
             } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
                 mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet, mSubscription);
-- 
1.9.1