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

Merge "Change encryption preference's summary accordingly" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-06 21:31:07 +00:00
committed by Android (Google) Code Review
parent b76682afcb d2a8b1ff02
commit 5218829f68
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
View File

@@ -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());