Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c94fcc9 authored by Ng Zhi An's avatar Ng Zhi An Committed by android-build-merger
Browse files

Merge "Reflect device encryption status" into oc-mr1-dev 

am: 3de3cf85

Change-Id: I0c64feb4eaa3b675cf0e6269279da04fe220f323
parents 078d01c8 3de3cf85

src/com/android/settings/SecuritySettings.java

+9 −0
Original line number Diff line number Diff line
@@ -359,6 +359,15 @@ public class SecuritySettings extends SettingsPreferenceFragment 
                    getResources().getString(R.string.switch_on_text));

        }



        // Encryption status of device

        if (LockPatternUtils.isDeviceEncryptionEnabled()) {

            root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(

                R.string.encryption_and_credential_settings_summary);

        } else {

            root.findPreference(KEY_ENCRYPTION_AND_CREDENTIALS).setSummary(

                R.string.summary_placeholder);

        }



        // Show password

        mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);