From 9132ab55331767fba0e3d20cf3ef91ffe2485688 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Wed, 17 Oct 2018 12:54:05 -0700 Subject: [PATCH] Refactor another network mode preference This preference show up if phone is not in world mode and offer some simplified choices. Bug: 114749736 Test: RunSettingsRoboTests Change-Id: I9204466be630f122fb02773d18a947706999ab79 --- res/values/config.xml | 3 +- res/values/strings.xml | 2 + res/xml/network_setting_fragment.xml | 3 +- ...nabledNetworkModePreferenceController.java | 334 +++++++++++++++ .../telephony/MobileNetworkFragment.java | 390 +----------------- .../network/telephony/MobileNetworkUtils.java | 21 + ...edNetworkModePreferenceControllerTest.java | 145 +++++++ 7 files changed, 508 insertions(+), 390 deletions(-) create mode 100644 src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java diff --git a/res/values/config.xml b/res/values/config.xml index 8e60505ccc0..b496080ea68 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -143,6 +143,5 @@ false - + diff --git a/res/values/strings.xml b/res/values/strings.xml index ac8f305dbf1..45fd3b27fa9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10261,6 +10261,8 @@ App data usage + + Invalid Network Mode %1$d. Ignore. Unavailable when connected to %1$s diff --git a/res/xml/network_setting_fragment.xml b/res/xml/network_setting_fragment.xml index 6cfa0a3aefa..044651cbd2d 100644 --- a/res/xml/network_setting_fragment.xml +++ b/res/xml/network_setting_fragment.xml @@ -66,7 +66,8 @@ 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" /> + android:dialogTitle="@string/preferred_network_mode_dialogtitle" + settings:controller="com.android.settings.network.telephony.EnabledNetworkModePreferenceController"/>