922a11f659
FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.
For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings. Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.
Test: On Cuttlefish with and without encryption enabled, tested visiting
the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
(cherry picked from commit 36609c18d1)
Merged-In: I3ce9894291ea1f1886f21980a86a92bfce38038a
81 lines
3.3 KiB
XML
81 lines
3.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2017 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:title="@string/encryption_and_credential_settings_title">
|
|
|
|
<PreferenceCategory
|
|
android:key="encryption_and_credentials_status_category"
|
|
android:title="@string/crypt_keeper_settings_title">
|
|
|
|
<Preference
|
|
android:key="encryption_and_credentials_encryption_status"
|
|
android:title="@string/crypt_keeper_encrypt_title"
|
|
android:summary="@string/summary_placeholder" />
|
|
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="credentials_management"
|
|
android:title="@string/credentials_title"
|
|
android:persistent="false"
|
|
android:order="100">
|
|
|
|
<Preference
|
|
android:key="trusted_credentials"
|
|
android:title="@string/trusted_credentials"
|
|
android:summary="@string/trusted_credentials_summary"
|
|
android:fragment="com.android.settings.TrustedCredentialsSettings" />
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="user_credentials"
|
|
android:title="@string/user_credentials"
|
|
android:summary="@string/user_credentials_summary"
|
|
android:fragment="com.android.settings.UserCredentialsSettings"
|
|
settings:userRestriction="no_config_credentials" />
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="install_certificate"
|
|
android:title="@string/credentials_install"
|
|
android:summary="@string/credentials_install_summary"
|
|
android:fragment="com.android.settings.security.InstallCertificateFromStorage"
|
|
settings:userRestriction="no_config_credentials" />
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="credentials_reset"
|
|
android:title="@string/credentials_reset"
|
|
android:summary="@string/credentials_reset_summary"
|
|
settings:userRestriction="no_config_credentials">
|
|
|
|
<intent
|
|
android:action="com.android.credentials.RESET"
|
|
android:targetPackage="com.android.settings" />
|
|
|
|
</com.android.settingslib.RestrictedPreference>
|
|
|
|
<Preference
|
|
android:key="certificate_management_app"
|
|
android:title="@string/certificate_management_app"
|
|
android:summary="@string/summary_placeholder"
|
|
android:fragment="com.android.settings.security.CredentialManagementAppFragment"
|
|
settings:controller="com.android.settings.security.CredentialManagementAppPreferenceController"/>
|
|
|
|
</PreferenceCategory>
|
|
|
|
</PreferenceScreen>
|