Merge "Reflect device encryption status" into oc-mr1-dev (3de3cf85) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SecuritySettings.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -359,6 +359,15 @@ public class SecuritySettings extends SettingsPreferenceFragment
	getResources().getString(R.string.switch_on_text));		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		// Show password
	mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);		mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);