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

2
res/values/strings.xml
View File

@@ -819,8 +819,10 @@
<string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string> <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>
<!-- Security Settings screen Encryption and crendential summary --> <!-- Security Settings screen Encryption and crendential summary -->
<string name="encryption_and_credential_settings_summary" product="default">Phone encrypted</string> <string name="encryption_and_credential_settings_summary" product="default">Phone encrypted</string>
<string name="decryption_settings_summary" product="default">Phone not encrypted</string>
<!-- Security Settings screen Encryption and crendential summary --> <!-- Security Settings screen Encryption and crendential summary -->
<string name="encryption_and_credential_settings_summary" product="tablet">Device encrypted</string> <string name="encryption_and_credential_settings_summary" product="tablet">Device encrypted</string>
<string name="decryption_settings_summary" product="tablet">Device not encrypted</string>
<!-- Security Settings screen setting option title for the item to take you to the lock screen preference screen [CHAR LIMIT=60] --> <!-- Security Settings screen setting option title for the item to take you to the lock screen preference screen [CHAR LIMIT=60] -->
<string name="lockscreen_settings_title">Lock screen preferences</string> <string name="lockscreen_settings_title">Lock screen preferences</string>

2
src/com/android/settings/security/EncryptionStatusPreferenceController.java
View File

@@ -56,7 +56,7 @@ public class EncryptionStatusPreferenceController extends BasePreferenceControll
if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE)) { if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE)) {
preference.setFragment(CryptKeeperSettings.class.getName()); preference.setFragment(CryptKeeperSettings.class.getName());
} }
preference.setSummary(R.string.summary_placeholder); preference.setSummary(R.string.decryption_settings_summary);
} }
} }

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

@@ -84,7 +84,7 @@ public class EncryptionStatusPreferenceControllerTest {
mController.updateState(mPreference); 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.getSummary()).isEqualTo(summary);
assertThat(mController.getPreferenceKey()).isNotEqualTo(PREF_KEY_ENCRYPTION_SECURITY_PAGE); assertThat(mController.getPreferenceKey()).isNotEqualTo(PREF_KEY_ENCRYPTION_SECURITY_PAGE);
assertThat(mPreference.getFragment()).isEqualTo(CryptKeeperSettings.class.getName()); assertThat(mPreference.getFragment()).isEqualTo(CryptKeeperSettings.class.getName());
@@ -98,7 +98,7 @@ public class EncryptionStatusPreferenceControllerTest {
mController.updateState(mPreference); 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.getSummary()).isEqualTo(summary);
assertThat(mPreference.getFragment()).isNotEqualTo(CryptKeeperSettings.class.getName()); assertThat(mPreference.getFragment()).isNotEqualTo(CryptKeeperSettings.class.getName());