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

Merge "Ability to hide verification settings" into jb-mr1-dev

Browse Source
This commit is contained in:
rich cannings
2012-09-16 15:50:08 -07:00
committed by Android (Google) Code Review
parent 70c6e0fb33 bbc3045a26
commit d41fd604cb
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/SecuritySettings.java
View File

@@ -245,12 +245,14 @@ public class SecuritySettings extends SettingsPreferenceFragment
mToggleAppInstallation.setChecked(isNonMarketAppsAllowed()); mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
// Package verification // Package verification
mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS); if (showVerifierSetting()) {
if (isVerifierInstalled()) { mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS);
mToggleVerifyApps.setChecked(isVerifyAppsEnabled()); if (isVerifierInstalled()) {
} else { mToggleVerifyApps.setChecked(isVerifyAppsEnabled());
mToggleVerifyApps.setChecked(false); } else {
mToggleVerifyApps.setEnabled(false); mToggleVerifyApps.setChecked(false);
mToggleVerifyApps.setEnabled(false);
}
} }
mUserSelectedWidget = root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET); mUserSelectedWidget = root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET);
@@ -300,6 +302,11 @@ public class SecuritySettings extends SettingsPreferenceFragment
return (receivers.size() > 0) ? true : false; return (receivers.size() > 0) ? true : false;
} }
private boolean showVerifierSetting() {
return Settings.Global.getInt(getContentResolver(),
Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1) > 0;
}
private void warnAppInstallation() { private void warnAppInstallation() {
// TODO: DialogFragment? // TODO: DialogFragment?
mWarnInstallApps = new AlertDialog.Builder(getActivity()).setTitle( mWarnInstallApps = new AlertDialog.Builder(getActivity()).setTitle(