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

am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

Browse Source 
* commit '602d559d9c59074664ad684579dc3d14a09219cb':
  Several fixes to new EncryptionInterstitial dialog.
This commit is contained in:
Jim Miller
2014-10-17 23:52:42 +00:00
committed by Android Git Automerger
parent edbada7acd 602d559d9c
commit ba1b33407d
6 changed files with 92 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,15 +218,12 @@ public class SecuritySettings extends SettingsPreferenceFragment
}
if (mIsPrimary) {
switch (mDPM.getStorageEncryptionStatus()) {
case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
if (LockPatternUtils.isDeviceEncryptionEnabled()) {
// The device is currently encrypted.
addPreferencesFromResource(R.xml.security_settings_encrypted);
break;
case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
} else {
// This device supports encryption but isn't encrypted.
addPreferencesFromResource(R.xml.security_settings_unencrypted);
break;
}
}