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

Rename crypt_keeper_* strings that are still used

Browse Source 
Some strings used in the Settings UI have "crypt_keeper" in their names,
but they aren't specific to FDE, which is no longer supported.  They are
still used to report the encrypted status of the device on devices that
use FBE, or the unencrypted status of the device on devices that don't
have encryption enabled at all.  Rename these strings appropriately.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: Ic63910c870837f5b37e4407ba5b3c7629e925c17
This commit is contained in:
Eric Biggers
2022-01-11 17:01:22 -08:00
parent 36609c18d1
commit 6552bdd0ef
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ public class EncryptionStatusPreferenceControllerTest {
assertThat(mPreference.getFragment()).isNull();
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getText(R.string.crypt_keeper_encrypted_summary));
.isEqualTo(mContext.getText(R.string.encrypted_summary));
}
@Test
@@ -103,7 +103,7 @@ public class EncryptionStatusPreferenceControllerTest {
mController.updateState(mPreference);
final CharSequence summary = mContext.getText(R.string.decryption_settings_summary);
final CharSequence summary = mContext.getText(R.string.not_encrypted_summary);
assertThat(mPreference.getSummary()).isEqualTo(summary);
assertThat(mController.getPreferenceKey()).isNotEqualTo(PREF_KEY_ENCRYPTION_SECURITY_PAGE);
assertThat(mPreference.getFragment()).isNull();
@@ -118,7 +118,7 @@ public class EncryptionStatusPreferenceControllerTest {
mController.updateState(mPreference);
final CharSequence summary = mContext.getText(R.string.decryption_settings_summary);
final CharSequence summary = mContext.getText(R.string.not_encrypted_summary);
assertThat(mPreference.getSummary()).isEqualTo(summary);
assertThat(mPreference.getFragment()).isNull();
}