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

Merge "Add isAvailable check to devOptionsController"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-20 23:29:51 +00:00
committed by Android (Google) Code Review
parent 41df9518ab f5539a1969
commit 2fe10447c6
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
View File

@@ -69,12 +69,12 @@ public class BluetoothSnoopLogPreferenceController extends
}
@Override
public void onDeveloperOptionsEnabled() {
protected void onDeveloperOptionsSwitchEnabled() {
mPreference.setEnabled(true);
}
@Override
public void onDeveloperOptionsDisabled() {
protected void onDeveloperOptionsSwitchDisabled() {
SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, Boolean.toString(false));
mPreference.setChecked(false);
mPreference.setEnabled(false);

23
src/com/android/settings/development/DeveloperOptionsPreferenceController.java
View File

@@ -54,10 +54,29 @@ public abstract class DeveloperOptionsPreferenceController extends
/**
* Called when developer options is enabled
*/
public abstract void onDeveloperOptionsEnabled();
public void onDeveloperOptionsEnabled() {
if (isAvailable()) {
onDeveloperOptionsSwitchEnabled();
}
}
/**
* Called when developer options is disabled
*/
public abstract void onDeveloperOptionsDisabled();
public void onDeveloperOptionsDisabled() {
if (isAvailable()) {
onDeveloperOptionsSwitchDisabled();
}
}
/**
* Called when developer options is enabled and the preference is available
*/
protected abstract void onDeveloperOptionsSwitchEnabled();
/**
* Called when developer options is disabled and the preference is available
*/
protected abstract void onDeveloperOptionsSwitchDisabled();
}

8
src/com/android/settings/development/OemUnlockPreferenceController.java
View File

@@ -122,12 +122,12 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
}
@Override
public void onDeveloperOptionsEnabled() {
protected void onDeveloperOptionsSwitchEnabled() {
handleDeveloperOptionsToggled();
}
@Override
public void onDeveloperOptionsDisabled() {
protected void onDeveloperOptionsSwitchDisabled() {
handleDeveloperOptionsToggled();
}
@@ -143,10 +143,6 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
}
private void handleDeveloperOptionsToggled() {
if (mPreference == null) {
return;
}
mPreference.setEnabled(enableOemUnlockPreference());
if (mPreference.isEnabled()) {
// Check restriction, disable mEnableOemUnlock and apply policy transparency.

26
src/com/android/settings/development/StayAwakePreferenceController.java
View File

@@ -100,19 +100,6 @@ public class StayAwakePreferenceController extends DeveloperOptionsPreferenceCon
mPreference.setChecked(stayAwakeMode != SETTING_VALUE_OFF);
}
@Override
public void onDeveloperOptionsEnabled() {
mPreference.setEnabled(true);
}
@Override
public void onDeveloperOptionsDisabled() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, SETTING_VALUE_OFF);
mPreference.setChecked(false);
mPreference.setEnabled(false);
}
@Override
public void onResume() {
if (mPreference != null) {
@@ -127,6 +114,19 @@ public class StayAwakePreferenceController extends DeveloperOptionsPreferenceCon
}
}
@Override
protected void onDeveloperOptionsSwitchEnabled() {
mPreference.setEnabled(true);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, SETTING_VALUE_OFF);
mPreference.setChecked(false);
mPreference.setEnabled(false);
}
@VisibleForTesting
RestrictedLockUtils.EnforcedAdmin checkIfMaximumTimeToLockSetByAdmin() {
// A DeviceAdmin has specified a maximum time until the device