summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DevelopmentSettings.java
diff options
context:
space:
mode:
authorDvTonder <david.vantonder@gmail.com>2013-02-18 09:25:26 -0500
committerDvTonder <david.vantonder@gmail.com>2013-02-18 16:55:45 -0500
commit99ea39bc5e31518dd139e39ad83832db31673886 (patch)
tree2a4308959270e0aac0ad57837e8006525ad50507 /src/com/android/settings/DevelopmentSettings.java
parentbaaf440704aa11f5bc09599ce3b17a4a8faf883e (diff)
downloadpackages_apps_Settings-99ea39bc5e31518dd139e39ad83832db31673886.zip
packages_apps_Settings-99ea39bc5e31518dd139e39ad83832db31673886.tar.gz
packages_apps_Settings-99ea39bc5e31518dd139e39ad83832db31673886.tar.bz2
Settings: Add Advanced reboot (1 of 2)
This commit adds a setting in Development settings for including options in the power menu for rebooting into recovery or bootloader, defauled to off. When enabled, the Advanced reboot options will only be available once the device is unlocked. Change-Id: I72d6df55bf5df251802b321410670646d26c54b0
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
-rw-r--r--src/com/android/settings/DevelopmentSettings.java28
1 files changed, 27 insertions, 1 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 5ebc287..7796c5e 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -148,6 +148,8 @@ public class DevelopmentSettings extends PreferenceFragment
private static final String DEVELOPMENT_TOOLS = "development_tools";
+ private static final String ADVANCED_REBOOT_KEY = "advanced_reboot";
+
private static final int RESULT_DEBUG_APP = 1000;
private IWindowManager mWindowManager;
@@ -204,6 +206,8 @@ public class DevelopmentSettings extends PreferenceFragment
private Object mSelectedRootValue;
private PreferenceScreen mDevelopmentTools;
+ private CheckBoxPreference mAdvancedReboot;
+
private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
private final ArrayList<CheckBoxPreference> mResetCbPrefs
= new ArrayList<CheckBoxPreference>();
@@ -238,10 +242,12 @@ public class DevelopmentSettings extends PreferenceFragment
mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD);
mAllPrefs.add(mPassword);
+ mAdvancedReboot = findAndInitCheckboxPref(ADVANCED_REBOOT_KEY);
if (!android.os.Process.myUserHandle().equals(UserHandle.OWNER)) {
disableForUser(mEnableAdb);
disableForUser(mPassword);
+ disableForUser(mAdvancedReboot);
}
mDebugAppPref = findPreference(DEBUG_APP_KEY);
@@ -488,6 +494,23 @@ public class DevelopmentSettings extends PreferenceFragment
updateVerifyAppsOverUsbOptions();
updateBugreportOptions();
updateRootAccessOptions();
+ updateAdvancedRebootOptions();
+ }
+
+ private void resetAdvancedRebootOptions() {
+ Settings.Secure.putInt(getActivity().getContentResolver(),
+ Settings.Secure.ADVANCED_REBOOT, 0);
+ }
+
+ private void writeAdvancedRebootOptions() {
+ Settings.Secure.putInt(getActivity().getContentResolver(),
+ Settings.Secure.ADVANCED_REBOOT,
+ mAdvancedReboot.isChecked() ? 1 : 0);
+ }
+
+ private void updateAdvancedRebootOptions() {
+ mAdvancedReboot.setChecked(Settings.Secure.getInt(getActivity().getContentResolver(),
+ Settings.Secure.ADVANCED_REBOOT, 0) != 0);
}
private void updateAdbOverNetwork() {
@@ -529,6 +552,7 @@ public class DevelopmentSettings extends PreferenceFragment
}
resetDebuggerOptions();
resetRootAccessOptions();
+ resetAdvancedRebootOptions();
writeAnimationScaleOption(0, mWindowAnimationScale, null);
writeAnimationScaleOption(1, mTransitionAnimationScale, null);
writeAnimationScaleOption(2, mAnimatorDurationScale, null);
@@ -604,7 +628,7 @@ public class DevelopmentSettings extends PreferenceFragment
mKillAppLongpressBack.setChecked(Settings.Secure.getInt(
getActivity().getContentResolver(), Settings.Secure.KILL_APP_LONGPRESS_BACK, 0) != 0);
}
-
+
private void updatePasswordSummary() {
try {
if (mBackupManager.hasBackupPassword()) {
@@ -1242,6 +1266,8 @@ public class DevelopmentSettings extends PreferenceFragment
writeDebugLayoutOptions();
} else if (preference == mKillAppLongpressBack) {
writeKillAppLongpressBackOptions();
+ } else if (preference == mAdvancedReboot) {
+ writeAdvancedRebootOptions();
}
return false;