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

This commit is contained in:
TreeHugger Robot
2018-03-08 02:58:25 +00:00
committed by Android (Google) Code Review

View File

@@ -28,13 +28,15 @@
android:key="saved_device_list" android:key="saved_device_list"
android:title="@string/connected_device_saved_title"/> android:title="@string/connected_device_saved_title"/>
<Preference <com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail" android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
android:key="add_bt_devices" android:key="add_bt_devices"
android:title="@string/connected_device_add_device_title" android:title="@string/connected_device_add_device_title"
android:icon="@drawable/ic_menu_add" android:icon="@drawable/ic_menu_add"
android:summary="@string/connected_device_add_device_summary" android:summary="@string/connected_device_add_device_summary"
settings:allowDividerAbove="true"/> settings:allowDividerAbove="true"
settings:userRestriction="no_config_bluetooth"
settings:useAdminDisabledSummary="true"/>
<Preference <Preference
android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment" android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"