RadioInfo network mode list and network mode string add 5G
ag/9305815 implemented 5G RATs in Settings UI.
Which need to be ported into RadioInfo.
Bug: 143995814
Test: 1.build pass 2.RadioInfo set network mode work.
Result:
12-13 15:07:57.562 2270 2270 D RadioInfo: Calling setPreferredNetworkType(0)
12-13 15:07:57.562 2270 2270 D Phone : setPreferredNetworkType: networkType = 0 modemRaf = 36964 rafFromType = 50055 filteredType = 0
12-13 15:08:03.213 2270 2270 D RadioInfo: Calling setPreferredNetworkType(1)
12-13 15:08:03.213 2270 2270 D Phone : setPreferredNetworkType: networkType = 1 modemRaf = 36964 rafFromType = 32771 filteredType = 1
12-13 15:08:07.661 2270 2270 D RadioInfo: Calling setPreferredNetworkType(2)
12-13 15:08:07.661 2270 2270 D Phone : setPreferredNetworkType: networkType = 2 modemRaf = 36964 rafFromType = 17284 filteredType = 2
...
12-13 15:10:22.342 2270 2270 D RadioInfo: Calling setPreferredNetworkType(22)
12-13 15:10:22.342 2270 2270 D Phone : setPreferredNetworkType: networkType = 22 modemRaf = 36964 rafFromType = 392191 filteredType = 10
12-13 15:10:26.233 2270 2270 D RadioInfo: Calling setPreferredNetworkType(23)
12-13 15:10:26.234 2270 2270 D Phone : setPreferredNetworkType: networkType = 23 modemRaf = 36964 rafFromType = 524288 filteredType = 10
12-13 15:10:32.765 2270 2270 D RadioInfo: Calling setPreferredNetworkType(24)
12-13 15:10:32.765 2270 2270 D Phone : setPreferredNetworkType: networkType = 24 modemRaf = 36964 rafFromType = 790528 filteredType = 11
12-13 15:10:36.673 2270 2270 D RadioInfo: Calling setPreferredNetworkType(25)
12-13 15:10:36.673 2270 2270 D Phone : setPreferredNetworkType: networkType = 25 modemRaf = 36964 rafFromType = 800888 filteredType = 8
12-13 15:10:40.184 2270 2270 D RadioInfo: Calling setPreferredNetworkType(26)
12-13 15:10:40.184 2270 2270 D Phone : setPreferredNetworkType: networkType = 26 modemRaf = 36964 rafFromType = 840583 filteredType = 9
12-13 15:10:43.241 2270 2270 D RadioInfo: Calling setPreferredNetworkType(27)
12-13 15:10:43.241 2270 2270 D Phone : setPreferredNetworkType: networkType = 27 modemRaf = 36964 rafFromType = 850943 filteredType = 10
12-13 15:10:49.721 2270 2270 D RadioInfo: Calling setPreferredNetworkType(28)
12-13 15:10:49.721 2270 2270 D Phone : setPreferredNetworkType: networkType = 28 modemRaf = 36964 rafFromType = 807812 filteredType = 12
12-13 15:10:53.081 2270 2270 D RadioInfo: Calling setPreferredNetworkType(29)
12-13 15:10:53.081 2270 2270 D Phone : setPreferredNetworkType: networkType = 29 modemRaf = 36964 rafFromType = 856064 filteredType = 11
12-13 15:10:56.709 2270 2270 D RadioInfo: Calling setPreferredNetworkType(30)
12-13 15:10:56.709 2270 2270 D Phone : setPreferredNetworkType: networkType = 30 modemRaf = 36964 rafFromType = 888835 filteredType = 10
12-13 15:11:14.545 2270 2270 D RadioInfo: Calling setPreferredNetworkType(31)
12-13 15:11:14.545 2270 2270 D Phone : setPreferredNetworkType: networkType = 31 modemRaf = 36964 rafFromType = 873348 filteredType = 12
12-13 15:11:20.279 2270 2270 D RadioInfo: Calling setPreferredNetworkType(32)
12-13 15:11:20.279 2270 2270 D Phone : setPreferredNetworkType: networkType = 32 modemRaf = 36964 rafFromType = 906119 filteredType = 9
12-13 15:11:23.327 2270 2270 D RadioInfo: Calling setPreferredNetworkType(33)
12-13 15:11:23.327 2270 2270 D Phone : setPreferredNetworkType: networkType = 33 modemRaf = 36964 rafFromType = 916479 filteredType = 10
Change-Id: I5dd0e604c16d6a689eaf2280d74bfcdff4ae743d
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b97ef10..6ac95c3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -438,6 +438,17 @@
<item>LTE/TDSCDMA/GSM/WCDMA</item>
<item>TDSCDMA/CDMA/EVDO/GSM/WCDMA </item>
<item>LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA</item>
+ <item>NR only</item>
+ <item>NR/LTE</item>
+ <item>NR/LTE/CDMA/EvDo</item>
+ <item>NR/LTE/GSM/WCDMA</item>
+ <item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item>
+ <item>NR/LTE/WCDMA</item>
+ <item>NR/LTE/TDSCDMA</item>
+ <item>NR/LTE/TDSCDMA/GSM</item>
+ <item>NR/LTE/TDSCDMA/WCDMA</item>
+ <item>NR/LTE/TDSCDMA/GSM/WCDMA</item>
+ <item>NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</item>
</string-array>
<!-- The preferred network modes RIL constants, in order of the modes above,
e.g. the choice "GSM/WCDMA preferred" has the corresponding value "0" -->
@@ -465,6 +476,17 @@
<item>"20"</item>
<item>"21"</item>
<item>"22"</item>
+ <item>"23"</item>
+ <item>"24"</item>
+ <item>"25"</item>
+ <item>"26"</item>
+ <item>"27"</item>
+ <item>"28"</item>
+ <item>"29"</item>
+ <item>"30"</item>
+ <item>"31"</item>
+ <item>"32"</item>
+ <item>"33"</item>
</string-array>
<!-- The following strings are summaries for preferred network modes in Mobile network settings,
@@ -493,6 +515,8 @@
<string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>
<!-- CDMA+LTE/EVDO -->
<string name="preferred_network_mode_lte_cdma_evdo_summary">Preferred network mode: CDMA+LTE/EVDO</string>
+ <!-- LTE/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE/CDMA/EvDo/GSM/WCDMA</string>
<!-- Global -->
<string name="preferred_network_mode_global_summary">Preferred network mode: Global</string>
<!-- LTE / WCDMA -->
@@ -521,6 +545,28 @@
<string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>
<!-- LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA -->
<string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>
+ <!-- NR only [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_only_summary">Preferred network mode: NR only</string>
+ <!-- NR / LTE [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_summary">Preferred network mode: NR / LTE</string>
+ <!-- NR/LTE/CDMA/EvDo [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_cdma_evdo_summary">Preferred network mode: NR/LTE/CDMA/EvDo</string>
+ <!-- NR/LTE/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_gsm_wcdma_summary">Preferred network mode: NR/LTE/GSM/WCDMA</string>
+ <!-- NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_cdma_evdo_gsm_wcdma_summary">Preferred network mode: NR/LTE/CDMA/EvDo/GSM/WCDMA</string>
+ <!-- NR/LTE/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_wcdma_summary">Preferred network mode: NR/LTE/WCDMA</string>
+ <!-- NR/LTE/TDSCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_summary">Preferred network mode: NR/LTE/TDSCDMA</string>
+ <!-- NR/LTE/TDSCDMA/GSM [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_gsm_summary">Preferred network mode: NR/LTE/TDSCDMA/GSM</string>
+ <!-- NR/LTE/TDSCDMA/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_wcdma_summary">Preferred network mode: NR/LTE/TDSCDMA/WCDMA</string>
+ <!-- NR/LTE/TDSCDMA/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_gsm_wcdma_summary">Preferred network mode: NR/LTE/TDSCDMA/GSM/WCDMA</string>
+ <!-- NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_nr_lte_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>
<!-- Mobile network settings screen, name for call settings category -->
<string name="call_category">Calling</string>
@@ -757,6 +803,10 @@
<string name="multi_category_enable">Multi-category enabled</string>
<string name="multi_category_disable">Multi-category disabled</string>
+ <string name="network_recommended">\u0020(recommended)</string>
+ <string name="network_5G" translatable="false">5G</string>
+ <string name="network_lte_pure" translatable="false">LTE</string>
+ <string name="network_4G_pure" translatable="false">4G</string>
<string name="network_lte">LTE (recommended)</string>
<string name="network_4G">4G (recommended)</string>
<string name="network_3G" translatable="false">3G</string>
