Merge "Ability to hide verification settings" into jb-mr1-dev (d41fd604) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SecuritySettings.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -245,6 +245,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
		mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());

		// Package verification
		if (showVerifierSetting()) {
		mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS);
		if (isVerifierInstalled()) {
		mToggleVerifyApps.setChecked(isVerifyAppsEnabled());
		@@ -252,6 +253,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
		mToggleVerifyApps.setChecked(false);
		mToggleVerifyApps.setEnabled(false);
		}
		}

		mUserSelectedWidget = root.findPreference(KEY_CHOOSE_USER_SELECTED_LOCKSCREEN_WIDGET);
		if (mUserSelectedWidget != null) {
		@@ -300,6 +302,11 @@ public class SecuritySettings extends SettingsPreferenceFragment
		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() {
		// TODO: DialogFragment?
		mWarnInstallApps = new AlertDialog.Builder(getActivity()).setTitle(