Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5218829f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b76682af d2a8b1ff

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -819,8 +819,10 @@ 
    <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>

    <!-- Security Settings screen Encryption and crendential summary -->

    <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 -->

    <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] -->

    <string name="lockscreen_settings_title">Lock screen preferences</string>
































src/com/android/settings/security/EncryptionStatusPreferenceController.java



+1
−1






























Original line number
Diff line number
Diff line







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









        }



















    }
































tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java



+2
−2






























Original line number
Diff line number
Diff line







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