Merge "Introduce BluetoothDeviceNoNamePreferenceCtrl"

diff --cc src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index afc4b7f,e19d1df..787ce16
--- 1/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
--- 2/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@@ -204,12 -204,12 +204,12 @@@ public class DevelopmentSettingsDashboa
          // feature flags
          controllers.add(new WifiDisplayCertificationPreferenceController(context));
          // enable wi-fi verbose logging
 -        // aggressive wifi to mobile handover
 +        controllers.add(new WifiAggressiveHandoverPreferenceController(context));
          controllers.add(new WifiRoamScansPreferenceController(context));
 -        // mobile always active
 +        controllers.add(new MobileDataAlwaysOnPreferenceController(context));
          // tethering hardware acceleration
          // select usb configuration
-         // show bluetooth devices without names
+         controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
          // disable absolute volume
          // enable in-band ringing
          // bluetooth avrcp version