diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-04-03 17:32:15 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-03 17:32:15 -0700 |
| commit | d20261b0bbde997fed06aadcb3c067d168808f24 (patch) | |
| tree | 0c26cef948a9fc3bba29669c3e8517e8124dfb44 /src | |
| parent | 95be1ae5146d68522a488f9b93e3f64bdaa7c8b8 (diff) | |
| parent | 284bc9b3ff76d24c2dffcdd620172bcb4b0721cc (diff) | |
| download | packages_apps_settings-d20261b0bbde997fed06aadcb3c067d168808f24.zip packages_apps_settings-d20261b0bbde997fed06aadcb3c067d168808f24.tar.gz packages_apps_settings-d20261b0bbde997fed06aadcb3c067d168808f24.tar.bz2 | |
Merge "Profile: respect DPM when overriding screen lock (2/2)" into cm-10.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/profiles/ProfileConfig.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/profiles/ProfileConfig.java b/src/com/android/settings/profiles/ProfileConfig.java index 2a0981d..4e6967b 100644 --- a/src/com/android/settings/profiles/ProfileConfig.java +++ b/src/com/android/settings/profiles/ProfileConfig.java @@ -27,6 +27,7 @@ import android.app.ProfileGroup; import android.app.ProfileManager; import android.app.RingModeSettings; import android.app.StreamSettings; +import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -234,6 +235,13 @@ public class ProfileConfig extends SettingsPreferenceFragment R.array.profile_lockmode_summaries)[mProfile.getScreenLockMode()]); mScreenLockModePreference.setValue(String.valueOf(mProfile.getScreenLockMode())); mScreenLockModePreference.setOnPreferenceChangeListener(this); + + DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE); + if (dpm.requireSecureKeyguard()) { + mScreenLockModePreference.setEnabled(false); + mScreenLockModePreference.setSummary(R.string.unlock_set_unlock_disabled_summary); + } + systemPrefs.addPreference(mScreenLockModePreference); } |