mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-01-11 23:49:34 -05:00
Fixup network modes patch on 14.1
This commit is contained in:
parent
0df749ef73
commit
66a38a4705
@ -1,13 +1,13 @@
|
||||
From d731905f0209c623aca7059d2764786b938813b8 Mon Sep 17 00:00:00 2001
|
||||
From 611609a2022a35971ed2b3a6b065baa091313b8e Mon Sep 17 00:00:00 2001
|
||||
From: Tad <tad@spotco.us>
|
||||
Date: Fri, 28 Dec 2018 08:01:25 -0500
|
||||
Date: Fri, 28 Dec 2018 14:52:46 -0500
|
||||
Subject: [PATCH] More preferred network modes
|
||||
|
||||
Change-Id: I7c670fc1cb8d9c7f9a7a454286511865274f437b
|
||||
Change-Id: I9bc7d51e780316faa85584168dd8beb2c45e5a6e
|
||||
---
|
||||
res/values/strings.xml | 47 +++++++++++++++++++
|
||||
.../android/phone/MobileNetworkSettings.java | 43 ++++++++++-------
|
||||
2 files changed, 73 insertions(+), 17 deletions(-)
|
||||
.../android/phone/MobileNetworkSettings.java | 46 +++++++++++-------
|
||||
2 files changed, 76 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
||||
index 5be5e1c7..b8c4b9c6 100644
|
||||
@ -179,10 +179,22 @@ index 5be5e1c7..b8c4b9c6 100644
|
||||
<item>"1"</item>
|
||||
</string-array>
|
||||
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
|
||||
index d5c09924..ac904af0 100644
|
||||
index d5c09924..1104c2ea 100644
|
||||
--- a/src/com/android/phone/MobileNetworkSettings.java
|
||||
+++ b/src/com/android/phone/MobileNetworkSettings.java
|
||||
@@ -1025,7 +1025,7 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
@@ -831,8 +831,11 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
if (DBG) log("buttonNetworkMode: " + buttonNetworkMode);
|
||||
// if new mode is invalid ignore it
|
||||
switch (buttonNetworkMode) {
|
||||
+ case Phone.NT_MODE_WCDMA_ONLY:
|
||||
case Phone.NT_MODE_WCDMA_PREF:
|
||||
case Phone.NT_MODE_GSM_ONLY:
|
||||
+ case Phone.NT_MODE_LTE_ONLY:
|
||||
+ case Phone.NT_MODE_LTE_WCDMA:
|
||||
case Phone.NT_MODE_LTE_GSM_WCDMA:
|
||||
case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
|
||||
case Phone.NT_MODE_CDMA:
|
||||
@@ -1025,7 +1028,7 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
break;
|
||||
case Phone.NT_MODE_LTE_ONLY:
|
||||
mButtonPreferredNetworkMode.setSummary(
|
||||
@ -191,7 +203,7 @@ index d5c09924..ac904af0 100644
|
||||
break;
|
||||
case Phone.NT_MODE_LTE_TDSCDMA_GSM:
|
||||
mButtonPreferredNetworkMode.setSummary(
|
||||
@@ -1072,11 +1072,11 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
@@ -1072,11 +1075,11 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
break;
|
||||
case Phone.NT_MODE_LTE_TDSCDMA_WCDMA:
|
||||
mButtonPreferredNetworkMode.setSummary(
|
||||
@ -205,7 +217,7 @@ index d5c09924..ac904af0 100644
|
||||
break;
|
||||
default:
|
||||
mButtonPreferredNetworkMode.setSummary(
|
||||
@@ -1093,7 +1093,6 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
@@ -1093,7 +1096,6 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
Integer.toString(Phone.NT_MODE_TDSCDMA_GSM_WCDMA));
|
||||
mButtonEnabledNetworks.setSummary(R.string.network_3G);
|
||||
break;
|
||||
@ -213,7 +225,7 @@ index d5c09924..ac904af0 100644
|
||||
case Phone.NT_MODE_GSM_UMTS:
|
||||
case Phone.NT_MODE_WCDMA_PREF:
|
||||
if (!mIsGlobalCdma) {
|
||||
@@ -1125,19 +1124,6 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
@@ -1125,19 +1127,6 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
controlGsmOptions(true);
|
||||
break;
|
||||
}
|
||||
@ -233,7 +245,7 @@ index d5c09924..ac904af0 100644
|
||||
case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
|
||||
if (isWorldMode()) {
|
||||
mButtonEnabledNetworks.setSummary(
|
||||
@@ -1199,6 +1185,29 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
@@ -1199,6 +1188,29 @@ public class MobileNetworkSettings extends PreferenceActivity
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user