Merge "Add credential management app preference to Settings"

This commit is contained in:
Alex Johnston
2020-12-03 10:00:27 +00:00
committed by Android (Google) Code Review
19 changed files with 940 additions and 12 deletions

View File

@@ -6335,6 +6335,14 @@
<string name="request_manage_credentials_allow">Allow</string>
<!-- Label for floating action button to scroll to the end of the authentication policy list [CHAR LIMIT=30] -->
<string name="request_manage_credentials_more">Show more</string>
<!-- Title of preference for the certificate management app [CHAR LIMIT=30] -->
<string name="certificate_management_app">Certificate management app</string>
<!-- Summary if there is no certificate management app [CHAR_LIMIT=NONE] -->
<string name="no_certificate_management_app">None</string>
<!-- Summary of preference if there is a certificate management app [CHAR LIMIT=NONE] -->
<string name="certificate_management_app_description">Certificates installed by this app identify you to the apps and URLs below</string>
<!-- Label for button to remove the credential management app [CHAR LIMIT=30] -->
<string name="remove_credential_management_app">Remove</string>
<!-- Sound settings screen, setting check box label -->
<string name="emergency_tone_title">Emergency dialing signal</string>

View File

@@ -823,13 +823,13 @@
<style name="RequestManageCredentialsTitle">
<item name="android:layout_marginTop">24dp</item>
<item name="android:textSize">36sp</item>
<item name="android:textColor">#202124</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="RequestManageCredentialsDescription">
<item name="android:layout_marginTop">24dp</item>
<item name="android:textSize">18sp</item>
<item name="android:textColor">#202124</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="AppAuthenticationPolicyItem">
@@ -845,12 +845,25 @@
<style name="AppAuthenticationPolicyText">
<item name="android:maxLines">1</item>
<item name="android:textSize">20sp</item>
<item name="android:textColor">#202124</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="AppAuthenticationPolicyNumberOfUrisText">
<item name="android:layout_marginTop">4dp</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:alpha">0.7</item>
</style>
<style name="AppAuthenticationExpander">
<item name="android:layout_marginTop">24dp</item>
<item name="android:layout_alignParentEnd">true</item>
<item name="android:scaleType">fitEnd</item>
</style>
<style name="AppUriAuthenticationPolicyText">
<item name="android:maxLines">1</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">#5F6368</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
</resources>