From 41e02a94891d31c519c7f7b297749d9ee2ae8d37 Mon Sep 17 00:00:00 2001 From: Jyun LuoLai Date: Tue, 27 Mar 2018 11:05:56 +0800 Subject: [PATCH] Subtext of "Add device" should only show when BT is off Bug: 73960246 Test: Manual test & make RunSettingsRoboTests Change-Id: I6eb5fbed20a4ffc923faf992bbf0b30a817444a0 --- res/xml/connected_devices.xml | 3 +- .../AddDevicePreferenceController.java | 98 +++++++++++++ .../AddDevicePreferenceControllerTest.java | 132 ++++++++++++++++++ 3 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/connecteddevice/AddDevicePreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml index 9b84a434d8e..cef5361cbbb 100644 --- a/res/xml/connected_devices.xml +++ b/res/xml/connected_devices.xml @@ -36,7 +36,8 @@ android:summary="@string/connected_device_add_device_summary" settings:allowDividerAbove="true" settings:userRestriction="no_config_bluetooth" - settings:useAdminDisabledSummary="true"/> + settings:useAdminDisabledSummary="true" + settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>