diff --git a/res/values/strings.xml b/res/values/strings.xml index 4e81b7a129c..d9b0adf8ca0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -819,8 +819,10 @@ Encryption & credentials Phone encrypted + Phone not encrypted Device encrypted + Device not encrypted Lock screen preferences diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java index 0978935a49b..234124827b5 100644 --- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java +++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java @@ -56,7 +56,7 @@ public class EncryptionStatusPreferenceController extends BasePreferenceControll if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE)) { preference.setFragment(CryptKeeperSettings.class.getName()); } - preference.setSummary(R.string.summary_placeholder); + preference.setSummary(R.string.decryption_settings_summary); } } diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index 6f736b1246e..ee6d33aace0 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -84,7 +84,7 @@ public class EncryptionStatusPreferenceControllerTest { mController.updateState(mPreference); - final CharSequence summary = mContext.getText(R.string.summary_placeholder); + final CharSequence summary = mContext.getText(R.string.decryption_settings_summary); assertThat(mPreference.getSummary()).isEqualTo(summary); assertThat(mController.getPreferenceKey()).isNotEqualTo(PREF_KEY_ENCRYPTION_SECURITY_PAGE); assertThat(mPreference.getFragment()).isEqualTo(CryptKeeperSettings.class.getName()); @@ -98,7 +98,7 @@ public class EncryptionStatusPreferenceControllerTest { mController.updateState(mPreference); - final CharSequence summary = mContext.getText(R.string.summary_placeholder); + final CharSequence summary = mContext.getText(R.string.decryption_settings_summary); assertThat(mPreference.getSummary()).isEqualTo(summary); assertThat(mPreference.getFragment()).isNotEqualTo(CryptKeeperSettings.class.getName());