summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SecuritySettings.java
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2014-06-13 17:31:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-12 17:09:07 +0000
commitcbfda988167e5a08382dc64cb006f526faaa7c62 (patch)
tree3d9f4e21b2eb0c9b27b7ce5a50888f807b188fde /src/com/android/settings/SecuritySettings.java
parent72a00c459cddc044524e265f0551d2cc67f0352d (diff)
parent565653cef1039ab4e34e505185f1c77d847357cd (diff)
downloadpackages_apps_Settings-cbfda988167e5a08382dc64cb006f526faaa7c62.zip
packages_apps_Settings-cbfda988167e5a08382dc64cb006f526faaa7c62.tar.gz
packages_apps_Settings-cbfda988167e5a08382dc64cb006f526faaa7c62.tar.bz2
Merge "Remove pin and add restrictions for Security settings."
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
-rw-r--r--src/com/android/settings/SecuritySettings.java23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 5091eea..60a086a 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -58,7 +58,7 @@ import java.util.List;
/**
* Gesture lock pattern settings.
*/
-public class SecuritySettings extends RestrictedSettingsFragment
+public class SecuritySettings extends SettingsPreferenceFragment
implements OnPreferenceChangeListener, DialogInterface.OnClickListener, Indexable {
static final String TAG = "SecuritySettings";
private static final Intent TRUST_AGENT_INTENT =
@@ -115,10 +115,6 @@ public class SecuritySettings extends RestrictedSettingsFragment
private boolean mIsPrimary;
- public SecuritySettings() {
- super(null /* Don't ask for restrictions pin on creation. */);
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -274,6 +270,7 @@ public class SecuritySettings extends RestrictedSettingsFragment
} else {
removePreference(KEY_CREDENTIALS_MANAGER);
+ removePreference(KEY_CREDENTIALS_INSTALL);
}
// Application install
@@ -282,9 +279,12 @@ public class SecuritySettings extends RestrictedSettingsFragment
mToggleAppInstallation = (CheckBoxPreference) findPreference(
KEY_TOGGLE_INSTALL_APPLICATIONS);
mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
-
// Side loading of apps.
mToggleAppInstallation.setEnabled(mIsPrimary);
+ if (um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES)
+ || um.hasUserRestriction(UserManager.DISALLOW_INSTALL_APPS)) {
+ mToggleAppInstallation.setEnabled(false);
+ }
// Package verification, only visible to primary user and if enabled
mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS);
@@ -302,12 +302,8 @@ public class SecuritySettings extends RestrictedSettingsFragment
mToggleVerifyApps.setEnabled(false);
}
}
-
- if (shouldBePinProtected(RESTRICTIONS_PIN_SET)) {
- protectByRestrictions(mToggleAppInstallation);
- protectByRestrictions(mToggleVerifyApps);
- protectByRestrictions(mResetCredentials);
- protectByRestrictions(root.findPreference(KEY_CREDENTIALS_INSTALL));
+ if (um.hasUserRestriction(UserManager.ENSURE_VERIFY_APPS)) {
+ mToggleVerifyApps.setEnabled(false);
}
// Trust Agent preferences
@@ -504,9 +500,6 @@ public class SecuritySettings extends RestrictedSettingsFragment
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
- if (ensurePinRestrictedPreference(preference)) {
- return true;
- }
final String key = preference.getKey();
final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();