Update preferred networks selection menu
Move "Use 2G Only" checkbox to "Network Mode" Menu
This menu consists of the followings in GSM Phone:
- 4G/LTE
- 3G
- 2G
4G/LTE means it's preferred, falling back to 3G, falling back to 2G.
3G means it's preferred, falling back to 2G.
2G means 2G only.
If config_prefer_2g is false, "2G Only" removes from Menu.
To use "LTE" menu, set config_enabled_lte true as mcc/mnc.
That means config_enabled_lte is false as default.
If set config_show4GForLTE true in SystemUI, display 4G instead of LTE.
In case of CDMA Phone with LTE,
- LTE
- 3G
- 1x
- Global
For (global) roaming of cdma, should set config_show_cdma true as mcc/mnc.
Bug: 10332749, 10783369
Change-Id: I74a9096f528bcd2a9a1162b53194ece653243bf7
diff --git a/res/values/config.xml b/res/values/config.xml
index 5146b1f..9bfac9a 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -119,6 +119,10 @@
<bool name="config_apn_expand" translatable="false">true</bool>
<bool name="config_operator_selection_expand" translatable="false">true</bool>
<bool name="config_prefer_2g" translatable="false">true</bool>
+ <!-- Show enabled lte option for lte device -->
+ <bool name="config_enabled_lte" translatable="false">false</bool>
+ <!-- Show cdma auto network mode in (glabal) roaming -->
+ <bool name="config_show_cdma" translatable="false">false</bool>
<!-- Package name for the default in-call UI and dialer [DO NOT TRANSLATE] -->
<string name="ui_default_package" translatable="false">com.android.dialer</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f102cb7..ad876fa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -516,10 +516,63 @@
<string name="multi_category_enable">Multi-category enabled</string>
<string name="multi_category_disable">Multi-category disabled</string>
- <!-- Mobile network settings screen, setting option name -->
- <string name="prefer_2g">Use only 2G networks</string>
- <!-- Mobile network settings screen, setting summary text -->
- <string name="prefer_2g_summary">Saves battery</string>
+ <string-array name="enabled_networks_except_gsm_choices" translatable="false">
+ <item>LTE</item>
+ <item>3G</item>
+ </string-array>
+ <string-array name="enabled_networks_except_gsm_4g_choices" translatable="false">
+ <item>4G</item>
+ <item>3G</item>
+ </string-array>
+ <string-array name="enabled_networks_except_gsm_values" translatable="false">
+ <item>"9"</item>
+ <item>"0"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_except_lte_choices" translatable="false">
+ <item>3G</item>
+ <item>2G</item>
+ </string-array>
+ <string-array name="enabled_networks_except_lte_values" translatable="false">
+ <item>"0"</item>
+ <item>"1"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_except_gsm_lte_choices" translatable="false">
+ <item>3G</item>
+ </string-array>
+ <string-array name="enabled_networks_except_gsm_lte_values" translatable="false">
+ <item>"0"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_choices" translatable="false">
+ <item>LTE</item>
+ <item>3G</item>
+ <item>2G</item>
+ </string-array>
+ <string-array name="enabled_networks_4g_choices" translatable="false">
+ <item>4G</item>
+ <item>3G</item>
+ <item>2G</item>
+ </string-array>
+ <string-array name="enabled_networks_values" translatable="false">
+ <item>"9"</item>
+ <item>"0"</item>
+ <item>"1"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_cdma_choices" translatable="false">
+ <item>LTE</item>
+ <item>3G</item>
+ <item>1x</item>
+ <item>Global</item>
+ </string-array>
+ <string-array name="enabled_networks_cdma_values" translatable="false">
+ <item>"8"</item>
+ <item>"4"</item>
+ <item>"5"</item>
+ <item>"10"</item>
+ </string-array>
<!-- CDMA System select strings -->
<!-- Mobile network settings screen, setting option name -->
diff --git a/res/xml/gsm_umts_options.xml b/res/xml/gsm_umts_options.xml
index afdd0d3..df7f2d5 100644
--- a/res/xml/gsm_umts_options.xml
+++ b/res/xml/gsm_umts_options.xml
@@ -28,12 +28,6 @@
</PreferenceScreen>
- <com.android.phone.Use2GOnlyCheckBoxPreference
- android:key="button_prefer_2g_key"
- android:title="@string/prefer_2g"
- android:persistent="false"
- android:summary="@string/prefer_2g_summary"/>
-
<PreferenceScreen
android:key="button_carrier_sel_key"
android:title="@string/networks"
diff --git a/res/xml/network_setting.xml b/res/xml/network_setting.xml
index 7fd00fc..00430e8 100644
--- a/res/xml/network_setting.xml
+++ b/res/xml/network_setting.xml
@@ -43,4 +43,12 @@
android:entryValues="@array/preferred_network_mode_values"
android:dialogTitle="@string/preferred_network_mode_dialogtitle" />
+ <ListPreference
+ android:key="enabled_networks_key"
+ android:title="@string/preferred_network_mode_title"
+ android:summary="@string/preferred_network_mode_summary"
+ android:entries="@array/enabled_networks_choices"
+ android:entryValues="@array/enabled_networks_values"
+ android:dialogTitle="@string/preferred_network_mode_dialogtitle" />
+
</PreferenceScreen>