This change includes the following commits from internal R branch which are related to certificate management: 0206e76f46 CredentialStorage: Install keys using KeyChain 09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app 3acf3f5433 WiFi certificates installable from Wifi sub-preference 8439fd15f7 Fix strings for certificate installation in Settings Bug: 161347472 Test: builds & manual testing Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
74 lines
3.2 KiB
XML
74 lines
3.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2015 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/wifi_configure_settings_preference_title">
|
|
|
|
<SwitchPreference
|
|
android:key="enable_wifi_wakeup"
|
|
android:title="@string/wifi_wakeup"
|
|
android:icon="@drawable/ic_auto_wifi"
|
|
android:summary="@string/wifi_wakeup_summary"
|
|
settings:controller="com.android.settings.wifi.WifiWakeupPreferenceController"/>
|
|
|
|
<SwitchPreference
|
|
android:key="use_open_wifi_automatically"
|
|
android:icon="@drawable/ic_open_wifi_autoconnect"
|
|
android:title="@string/use_open_wifi_automatically_title"
|
|
android:summary="@string/use_open_wifi_automatically_summary"
|
|
settings:controller="com.android.settings.wifi.UseOpenWifiPreferenceController"/>
|
|
|
|
<SwitchPreference
|
|
android:key="notify_open_networks"
|
|
android:title="@string/wifi_notify_open_networks"
|
|
android:icon="@drawable/ic_open_wifi_notifications"
|
|
android:summary="@string/wifi_notify_open_networks_summary"
|
|
settings:keywords="@string/keywords_wifi_notify_open_networks"
|
|
settings:controller="com.android.settings.wifi.NotifyOpenNetworksPreferenceController"/>
|
|
|
|
<SwitchPreference
|
|
android:key="wifi_cellular_data_fallback"
|
|
android:title="@string/wifi_cellular_data_fallback_title"
|
|
android:summary="@string/wifi_cellular_data_fallback_summary"
|
|
settings:controller="com.android.settings.wifi.CellularFallbackPreferenceController" />
|
|
|
|
<Preference
|
|
android:key="install_credentials"
|
|
android:title="@string/wifi_install_credentials">
|
|
<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>
|
|
|
|
<Preference
|
|
android:key="network_scorer_picker"
|
|
android:title="@string/network_scorer_picker_title"
|
|
android:fragment="com.android.settings.network.NetworkScorerPicker"
|
|
settings:controller="com.android.settings.network.NetworkScorerPickerPreferenceController" />
|
|
|
|
<Preference
|
|
android:key="wifi_direct"
|
|
android:title="@string/wifi_menu_p2p"
|
|
android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings" />
|
|
|
|
</PreferenceScreen>
|