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

Add support for showing the admin disabling settings.

Browse Source 
For settings disabled by user restrictions show
the user a lock icon and allow them to click to
find more info.

Bug: 22543585

Change-Id: Ie8b02ac26f2b22db386a9044f3c6570098f6e14b
This commit is contained in:
Sudheer Shanka
2015-11-23 12:07:05 +00:00
committed by Kenny Guy
parent f467c0acac
commit 9159fe9af8
14 changed files with 595 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
private KeyStore mKeyStore;
private Preference mResetCredentials;
private SwitchPreference mToggleAppInstallation;
private RestrictedSwitchPreference mToggleAppInstallation;
private DialogInterface mWarnInstallApps;
private SwitchPreference mPowerButtonInstantlyLocks;
@@ -313,15 +313,19 @@ public class SecuritySettings extends SettingsPreferenceFragment
// Application install
PreferenceGroup deviceAdminCategory = (PreferenceGroup)
root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
mToggleAppInstallation = (SwitchPreference) findPreference(
mToggleAppInstallation = (RestrictedSwitchPreference) findPreference(
KEY_TOGGLE_INSTALL_APPLICATIONS);
mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
// Side loading of apps.
// Disable for restricted profiles. For others, check if policy disallows it.
mToggleAppInstallation.setEnabled(!um.getUserInfo(MY_USER_ID).isRestricted());
if (um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES)
|| um.hasUserRestriction(UserManager.DISALLOW_INSTALL_APPS)) {
mToggleAppInstallation.setEnabled(false);
if (mToggleAppInstallation.isEnabled()) {
mToggleAppInstallation.checkRestrictionAndSetDisabled(
UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
if (!mToggleAppInstallation.isDisabledByAdmin()) {
mToggleAppInstallation.checkRestrictionAndSetDisabled(
UserManager.DISALLOW_INSTALL_APPS);
}
}
// Advanced Security features