OSDN Git Service

Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev
authorAntoan Angelov <arangelov@google.com>
Fri, 23 Mar 2018 14:10:29 +0000 (14:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 23 Mar 2018 14:10:29 +0000 (14:10 +0000)
1  2 
res/xml/connected_devices_advanced.xml

  <PreferenceScreen
      xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:settings="http://schemas.android.com/apk/res-auto"
 -    android:key="connected_devices_screen"
 +    android:key="connected_devices_advanced_screen"
      android:title="@string/connected_device_connections_title">
  
-     <SwitchPreference
-       android:key="toggle_bluetooth_switch"
-       android:title="@string/bluetooth_settings_title"
-       android:icon="@drawable/ic_settings_bluetooth"
-       android:summary="@string/bluetooth_pref_summary"
-       android:order="-7"
-       settings:controller="com.android.settings.bluetooth.BluetoothSwitchPreferenceController"
-       settings:platform_slice="true"/>
+     <com.android.settingslib.RestrictedSwitchPreference
+         android:key="toggle_bluetooth_switch"
+         android:title="@string/bluetooth_settings_title"
+         android:icon="@drawable/ic_settings_bluetooth"
+         android:summary="@string/bluetooth_pref_summary"
+         android:order="-7"
+         settings:controller="com.android.settings.bluetooth.BluetoothSwitchPreferenceController"
+         settings:userRestriction="no_bluetooth"
+         settings:platform_slice="true"/>
  
      <SwitchPreference
          android:key="toggle_nfc"