Merge "Add CA certs Privacy Settings page"

This commit is contained in:
TreeHugger Robot
2017-03-09 10:51:14 +00:00
committed by Android (Google) Code Review
13 changed files with 445 additions and 5 deletions

View File

@@ -97,6 +97,14 @@
android:title="@string/enterprise_privacy_global_http_proxy"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="ca_certs_current_user"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
<com.android.settings.DividerPreference
android:key="ca_certs_managed_profile"
settings:allowDividerBelow="true"
settings:multiLine="true"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/enterprise_privacy_device_access_category">