c0c75a3e96
This is part of the changes to improve the UX and language for installing certificates.
Previously, the different types of certificate used the same installation flow.
Due to concerns around users installing CA certificates without understanding the conseqences,
this CL introduces a new warning dialog when a CA certificate is installed from settings.
Bug: 139173976
Test: Atest com.android.settings.security
manual testing from Settings by selecting the certificate type
preference and ensuring the installation flow still worked as expected.
Screenshot of the screen: https://hsv.googleplex.com/5046848484016128
Change-Id: If95bffd1e68f14734fb20e8cc4b60eeb1c372358
67 lines
2.5 KiB
XML
67 lines
2.5 KiB
XML
<!--
|
|
~ Copyright (C) 2019 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/credentials_install"
|
|
android:key="install_certificate_from_storage">
|
|
|
|
<PreferenceCategory
|
|
android:key="certificate_types">
|
|
|
|
<Preference
|
|
android:key="install_ca_certificate"
|
|
android:title="@string/ca_certificate">
|
|
|
|
<intent
|
|
android:targetPackage="com.android.settings"
|
|
android:targetClass="com.android.settings.security.InstallCaCertificateWarning">
|
|
</intent>
|
|
|
|
</Preference>
|
|
|
|
<Preference
|
|
android:key="install_user_certificate"
|
|
android:title="@string/user_certificate">
|
|
|
|
<intent
|
|
android:action="android.credentials.INSTALL"
|
|
android:targetPackage="com.android.certinstaller"
|
|
android:targetClass="com.android.certinstaller.CertInstallerMain">
|
|
<!-- Same value as CERTIFICATE_USAGE_USER in keystore/java/android/security/Credentials.java -->
|
|
<extra android:name="certificate_install_usage" android:value="user"/>
|
|
</intent>
|
|
|
|
</Preference>
|
|
|
|
<Preference
|
|
android:key="install_wifi_certificate"
|
|
android:title="@string/wifi_certificate">
|
|
|
|
<intent
|
|
android:action="android.credentials.INSTALL"
|
|
android:targetPackage="com.android.certinstaller"
|
|
android:targetClass="com.android.certinstaller.CertInstallerMain">
|
|
<!-- Same value as CERTIFICATE_USAGE_WIFI in keystore/java/android/security/Credentials.java -->
|
|
<extra android:name="certificate_install_usage" android:value="wifi"/>
|
|
</intent>
|
|
|
|
</Preference>
|
|
|
|
</PreferenceCategory>
|
|
|
|
</PreferenceScreen> |