From d622e14d8525e59527ac01b4e6b1981423463905 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Mon, 15 Oct 2018 17:31:16 -0700 Subject: [PATCH] Refactor roaming preference Use preferenceController instead Bug: 114749736 Test: RunSettingsRoboTests Change-Id: Idb0276ea0ed1738d93223e072338ba3c32498a9d --- res/xml/network_setting_fragment.xml | 4 +- .../network/telephony/MobileNetworkFragment.java | 81 +-------- .../network/telephony/RoamingDialogFragment.java | 28 ++-- .../telephony/RoamingPreferenceController.java | 181 +++++++++++++++++++++ .../telephony/RoamingPreferenceControllerTest.java | 144 ++++++++++++++++ 5 files changed, 340 insertions(+), 98 deletions(-) create mode 100644 src/com/android/settings/network/telephony/RoamingPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java diff --git a/res/xml/network_setting_fragment.xml b/res/xml/network_setting_fragment.xml index ce1644ff18..74e03ed9f1 100644 --- a/res/xml/network_setting_fragment.xml +++ b/res/xml/network_setting_fragment.xml @@ -36,7 +36,9 @@ android:title="@string/roaming" android:persistent="false" android:summaryOn="@string/roaming_enable" - android:summaryOff="@string/roaming_disable"/> + android:summaryOff="@string/roaming_disable" + settings:userRestriction="no_data_roaming" + settings:controller="com.android.settings.network.telephony.RoamingPreferenceController"/>