PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show policy transparency popup dialog for Bluetooth in Settings." into pi-dev

Browse Source
This commit is contained in:
Antoan Angelov
2018-03-23 14:10:29 +00:00
committed by Android (Google) Code Review
parent 2c1de66c58 75c603cedb
commit 84a4dd0bde
3 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
View File

@@ -109,7 +109,7 @@ public class BluetoothSwitchPreferenceController extends TogglePreferenceControl
* Control the switch inside {@link SwitchPreference}
*/
@VisibleForTesting
class SwitchController extends SwitchWidgetController implements
static class SwitchController extends SwitchWidgetController implements
Preference.OnPreferenceChangeListener {
private SwitchPreference mSwitchPreference;
@@ -156,7 +156,7 @@ public class BluetoothSwitchPreferenceController extends TogglePreferenceControl
@Override
public void setDisabledByAdmin(RestrictedLockUtils.EnforcedAdmin admin) {
mBtPreference.setEnabled(admin == null);
mSwitchPreference.setEnabled(admin == null);
}
}
}