From aeb1da0db95276ca6244f0f1e53eb81bc80d342f Mon Sep 17 00:00:00 2001 From: Antony Sargent Date: Mon, 13 May 2019 16:44:13 -0700 Subject: [PATCH] Add a "data during calls" preference This adds a switch which appears on the SIM details page for any SIMs that aren't the default on for data. It lets the user opt-in to turning on data on this SIM only in the case where there is an active call - this is needed because in some cases the default data SIM may not be able to be used when a call is active on another SIM. Bug: 132114205 Test: make RunSettingsRoboTests Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941 --- res/xml/mobile_network_settings_v2.xml | 6 + .../DataDuringCallsPreferenceController.java | 104 ++++++++++++++ .../telephony/MobileNetworkSettings.java | 1 + .../grandfather_slice_controller_not_in_xml | 1 + ...taDuringCallsPreferenceControllerTest.java | 134 ++++++++++++++++++ 5 files changed, 246 insertions(+) create mode 100644 src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/network/DataDuringCallsPreferenceControllerTest.java diff --git a/res/xml/mobile_network_settings_v2.xml b/res/xml/mobile_network_settings_v2.xml index 1ff886078c5..20ed1c75a22 100644 --- a/res/xml/mobile_network_settings_v2.xml +++ b/res/xml/mobile_network_settings_v2.xml @@ -85,6 +85,12 @@ android:summary="@string/mms_message_summary" settings:controller="com.android.settings.network.telephony.MmsMessagePreferenceController"/> + +