Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert the rest of encryption page into pref controller

Browse Source 
Bug: 32953042
Test: robotests
Change-Id: I6c1b28314a988e6499065ddaee2aeae0ac28c537
This commit is contained in:
Fan Zhang
2017-11-02 14:09:34 -07:00
parent c58a88368f
commit b2aae6cd57
12 changed files with 465 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/xml/encryption_and_credential.xml
View File

@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/encryption_and_credential_settings_title"
android:key="encryption_and_credentials_screen">
@@ -39,7 +40,9 @@
<com.android.settingslib.RestrictedPreference
android:key="credential_storage_type"
android:title="@string/credential_storage_type" />
android:title="@string/credential_storage_type"
android:summary="@string/summary_placeholder"
settings:userRestriction="no_config_credentials" />
<Preference
android:key="trusted_credentials"
@@ -51,12 +54,14 @@
android:key="user_credentials"
android:title="@string/user_credentials"
android:summary="@string/user_credentials_summary"
android:fragment="com.android.settings.UserCredentialsSettings" />
android:fragment="com.android.settings.UserCredentialsSettings"
settings:userRestriction="no_config_credentials" />
<com.android.settingslib.RestrictedPreference
android:key="credentials_install"
android:title="@string/credentials_install"
android:summary="@string/credentials_install_summary">
android:summary="@string/credentials_install_summary"
settings:userRestriction="no_config_credentials">
<intent
android:action="android.credentials.INSTALL"
@@ -68,7 +73,8 @@
<com.android.settingslib.RestrictedPreference
android:key="credentials_reset"
android:title="@string/credentials_reset"
android:summary="@string/credentials_reset_summary">
android:summary="@string/credentials_reset_summary"
settings:userRestriction="no_config_credentials">
<intent
android:action="com.android.credentials.RESET"