Merge "Add preferences in new connected device page"

2017-12-01 23:00:20 +00:00
parent 4d9e1b4b6b b79e0d4279
commit b5931a6624
5 changed files with 51 additions and 7 deletions
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -73,10 +73,20 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme
    public void onStart() {
        super.onStart();

-        updateContent(mLocalAdapter.getBluetoothState());
+        updateBluetooth();
        mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
    }

+    @VisibleForTesting
+    void updateBluetooth() {
+        if (mLocalAdapter.isEnabled()) {
+            updateContent(mLocalAdapter.getBluetoothState());
+        } else {
+            // Turn on bluetooth if it is disabled
+            mLocalAdapter.enable();
+        }
+    }
+
    @Override
    public void onStop() {
        super.onStop();