From d055937664bb023f509fd9c31f9b6ff43fd916b2 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Mon, 4 Dec 2017 13:57:31 -0800 Subject: [PATCH] Create BluetoothSwitchPreference In the new design, bluetooth preference is not MasterSwitchPreference any more. This cl creates BluetoothSwitchPreference while reuse the BluetoothEnabler. Future cl will remove the BluetoothMasterSwitchPreference when P feature is finalized. Bug: 69333961 Test: RunSettingsRoboTests Change-Id: Ie1f934b4e93a6758a1b0cf83bb5098585a635c2a --- res/values/strings.xml | 2 + res/xml/connected_devices_advanced.xml | 5 +- .../BluetoothMasterSwitchPreferenceController.java | 1 + .../BluetoothSwitchPreferenceController.java | 161 +++++++++++++++++++++ .../AdvancedConnectedDeviceDashboardFragment.java | 7 +- .../BluetoothSwitchPreferenceControllerTest.java | 135 +++++++++++++++++ 6 files changed, 305 insertions(+), 6 deletions(-) create mode 100644 src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 7331d7265f..45aadf38d1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -393,6 +393,8 @@ Your devices Pair new device + + Allow device to pair and connect to bluetooth devices Currently connected diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml index 946151f297..57a2580c20 100644 --- a/res/xml/connected_devices_advanced.xml +++ b/res/xml/connected_devices_advanced.xml @@ -19,10 +19,11 @@ android:key="connected_devices_screen" android:title="@string/connected_devices_dashboard_title"> -