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

Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev

Browse Source
This commit is contained in:
Ben Lin
2018-03-12 17:52:37 +00:00
committed by Android (Google) Code Review
parent c984e49262 1f61ff4cf9
commit 2d452df643
4 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/bools.xml
View File

@@ -96,6 +96,9 @@
<!-- Whether device_administrators should be shown or not. --> <!-- Whether device_administrators should be shown or not. -->
<bool name="config_show_device_administrators">true</bool> <bool name="config_show_device_administrators">true</bool>
<!-- Whether encryption_and_credentials_encryption_status should be shown or not. -->
<bool name="config_show_encryption_and_credentials_encryption_status">true</bool>
<!-- Whether premium_sms should be shown or not. --> <!-- Whether premium_sms should be shown or not. -->
<bool name="config_show_premium_sms">true</bool> <bool name="config_show_premium_sms">true</bool>

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

@@ -41,6 +41,12 @@ public class EncryptionStatusPreferenceController extends BasePreferenceControll
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE) &&
!mContext.getResources().getBoolean(
R.bool.config_show_encryption_and_credentials_encryption_status)) {
return DISABLED_UNSUPPORTED;
}
return mUserManager.isAdminUser() ? AVAILABLE : DISABLED_FOR_USER; return mUserManager.isAdminUser() ? AVAILABLE : DISABLED_FOR_USER;
} }

1
tests/robotests/res/values-mcc999/config.xml
View File

@@ -34,6 +34,7 @@
<bool name="config_show_screen_locking_sounds">false</bool> <bool name="config_show_screen_locking_sounds">false</bool>
<bool name="config_show_touch_sounds">false</bool> <bool name="config_show_touch_sounds">false</bool>
<bool name="config_show_device_administrators">false</bool> <bool name="config_show_device_administrators">false</bool>
<bool name="config_show_encryption_and_credentials_encryption_status">false</bool>
<bool name="config_show_premium_sms">false</bool> <bool name="config_show_premium_sms">false</bool>
<bool name="config_show_data_saver">false</bool> <bool name="config_show_data_saver">false</bool>
<bool name="config_show_enabled_vr_listeners">false</bool> <bool name="config_show_enabled_vr_listeners">false</bool>

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

@@ -67,6 +67,23 @@ public class EncryptionStatusPreferenceControllerTest {
assertThat(mController.isAvailable()).isFalse(); assertThat(mController.isAvailable()).isFalse();
} }
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_notVisible_false() {
assertThat(mController.isAvailable()).isFalse();
}
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_notVisible_butNotDetailPage_true() {
mController = new EncryptionStatusPreferenceController(mContext,
PREF_KEY_ENCRYPTION_SECURITY_PAGE);
UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
Shadows.shadowOf(userManager).setIsAdminUser(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test @Test
public void updateSummary_encrypted_shouldSayEncrypted() { public void updateSummary_encrypted_shouldSayEncrypted() {
ShadowLockPatternUtils.setDeviceEncryptionEnabled(true); ShadowLockPatternUtils.setDeviceEncryptionEnabled(true);