hughchen 4bf7c3a921 Bluetooth and NFC added back to Connection preferences ...

* For fix the TreeHugger error in pi-dev, cherry pick the ag/4023339 in
  master and fix TreeHugger "Automatic merge failed" error.
* Bluetooth and NFC added back to "Connection preferences"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I8f4c389c28c7cc752f198be2b59b28b6e9af2c90

2018-05-16 08:03:00 +00:00

..

dock

Add DockUpdaterFeatureProvider and DockUpdater.

2018-04-19 16:04:08 +08:00

usb

Rename SubSettingLauncher.setTitle, add java doc

2018-05-09 10:00:05 +08:00

AddDevicePreferenceController.java

Establish permanently unavailable settings

2018-05-09 08:36:59 -07:00

AdvancedConnectedDeviceDashboardFragment.java

Bluetooth and NFC added back to Connection preferences

2018-05-16 08:03:00 +00:00

AvailableMediaDeviceGroupController.java

Merge "Establish permanently unavailable settings"

2018-05-09 18:14:32 +00:00

BluetoothDashboardFragment.java

Establish permanently unavailable settings

2018-05-09 08:36:59 -07:00

BluetoothOnWhileDrivingPreferenceController.java

Establish permanently unavailable settings

2018-05-09 08:36:59 -07:00

ConnectedDeviceDashboardFragment.java

Bluetooth and NFC added back to Connection preferences

2018-05-16 08:03:00 +00:00

ConnectedDeviceGroupController.java

Establish permanently unavailable settings

2018-05-09 08:36:59 -07:00

DevicePreferenceCallback.java

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

PreviouslyConnectedDeviceDashboardFragment.java

Implement previously connected device UI

2018-04-12 17:10:40 +00:00

SavedDeviceGroupController.java

Establish permanently unavailable settings

2018-05-09 08:36:59 -07:00