diff options
| author | Roman Birg <roman@cyngn.com> | 2015-12-16 17:43:11 -0800 |
|---|---|---|
| committer | Roman Birg <roman@cyngn.com> | 2015-12-21 12:06:10 -0800 |
| commit | 076ee754f132a210fcd4d901bc04bb4f09f54fe9 (patch) | |
| tree | a1d1c815cb8c4c4f6d961200390b2e6a599b167c /res/values/cm_arrays.xml | |
| parent | f01ba0833a96eed3c6c4d8628fb95428d634ce62 (diff) | |
| download | packages_apps_Settings-076ee754f132a210fcd4d901bc04bb4f09f54fe9.zip packages_apps_Settings-076ee754f132a210fcd4d901bc04bb4f09f54fe9.tar.gz packages_apps_Settings-076ee754f132a210fcd4d901bc04bb4f09f54fe9.tar.bz2 | |
Settings: respect telephony config for profiles override
Some networks specifically disallow 2G to be selected as the preferred
setting. We should respect that.
Change-Id: Ic4414ed78c9f38b5c11969300dc858725ee3b2c6
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'res/values/cm_arrays.xml')
| -rw-r--r-- | res/values/cm_arrays.xml | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 8689368..6628891 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -60,18 +60,32 @@ <item>@string/profile_action_none</item> </string-array> - <!-- Profile 2G-3G mode options. --> - <string-array name="profile_networkmode_entries" translatable="false"> - <item>@string/profile_networkmode_2g</item> + <!-- Profile 2G-3G and 4G mode values. --> + <string-array name="profile_networkmode_values_4g" translatable="false"> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + </string-array> + + <!-- Profile 2G-3G and 4G mode options. --> + <string-array name="profile_networkmode_entries_no_2g" translatable="false"> <item>@string/profile_networkmode_3g</item> + <item>@string/profile_networkmode_4g</item> <item>@string/profile_networkmode_2g3g</item> + <item>@string/profile_networkmode_2g3g4g</item> + <item>@string/profile_action_none</item> </string-array> - <!-- Values for profile connections. Do not translate. --> - <string-array name="profile_connection_values" translatable="false"> - <item>0</item> + <!-- Profile 2G-3G and 4G mode values. --> + <string-array name="profile_networkmode_values_no_2g" translatable="false"> <item>1</item> <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> </string-array> <!-- Profile lock mode options. Do not translate. --> |