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

am: 2d452df643 Change-Id: I027d3de2a7388da8b6ece1d03e9c2c5a0b4ffce9
2018-03-12 18:45:46 +00:00
parent 468ebafdc7 2d452df643
commit 4bdd8476e2
4 changed files with 27 additions and 0 deletions
--- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java
+++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
@@ -41,6 +41,12 @@ public class EncryptionStatusPreferenceController extends BasePreferenceControll

    @Override
    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;
    }