Merge "Merge sub pages for lock/unlock into 1 xml."

2018-01-05 00:36:17 +00:00
parent 2c3c8c8537 928ddbe731
commit b8b9b283fe
21 changed files with 1050 additions and 601 deletions
--- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
@@ -98,10 +98,11 @@ public class BluetoothSwitchPreferenceController extends TogglePreferenceControl
    }

    @Override
-    public void setChecked(boolean isChecked) {
+    public boolean setChecked(boolean isChecked) {
        if (mBluetoothAdapter != null) {
            mBluetoothAdapter.setBluetoothEnabled(isChecked);
        }
+        return true;
    }

    /**