commit e03bb88c09ef18eedd76f9aa8908ef788936aa73
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 08 02:58:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 08 02:58:25 2018 +0000
tree 6d68743b60ee4dd5f64cbba09a8828eaa32707b2
parent 799c2545c0c4cbb4118a855962b01794fadb94db
parent eb562c9457c57c03f9aec336f0be3b455351ce43

Merge "Make "Add device" as restricted preference." into pi-dev

res/xml/connected_devices.xml

diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 227dee2..9b84a43 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -28,13 +28,15 @@
         android:key="saved_device_list"
         android:title="@string/connected_device_saved_title"/>
 
-    <Preference
+    <com.android.settingslib.RestrictedPreference
         android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
         android:key="add_bt_devices"
         android:title="@string/connected_device_add_device_title"
         android:icon="@drawable/ic_menu_add"
         android:summary="@string/connected_device_add_device_summary"
-        settings:allowDividerAbove="true"/>
+        settings:allowDividerAbove="true"
+        settings:userRestriction="no_config_bluetooth"
+        settings:useAdminDisabledSummary="true"/>
 
     <Preference
         android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"