cce4e61260
To conform with UX guidelines and conventions, the following changes are made to the UI of app VPN's PreferenceFragment: (1. Always-on toggle title stays the same) 2. Always-on toggle subtext changes from "active"/"inactive" to an explanation of the feature 3. Lockdown toggle title is shortened 4. Lockdown toggle subtext is removed completely And the following changes are made to the legacy VPN's ConfigDialog: 5. Error message that is displayed below the "Always-on VPN" checkbox 6. Replacing \u2019 with \' Bug: 36382729 Test: manually navigate through VPN settings Test: make SettingsRoboTests Change-Id: If1b4faec8743dfbf6e3f8062b53190ad63700d25
51 lines
2.3 KiB
XML
51 lines
2.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2016 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/com.android.settings"
|
|
android:title="@string/vpn_title">
|
|
|
|
<Preference
|
|
android:key="version"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:selectable="false"/>
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="always_on_vpn"
|
|
android:title="@string/vpn_menu_lockdown"
|
|
android:defaultValue="false"
|
|
android:summary="@string/vpn_always_on_summary"
|
|
settings:userRestriction="no_config_vpn"
|
|
settings:useAdditionalSummary="true"
|
|
settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="lockdown_vpn"
|
|
android:title="@string/vpn_require_connection"
|
|
android:defaultValue="false"
|
|
android:dependency="always_on_vpn"
|
|
settings:userRestriction="no_config_vpn"
|
|
settings:useAdditionalSummary="true"
|
|
settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />
|
|
|
|
<com.android.settings.DimmableIconPreference
|
|
android:key="forget_vpn"
|
|
android:title="@string/vpn_forget_long"
|
|
android:icon="@drawable/ic_menu_delete"
|
|
settings:userRestriction="no_config_vpn"
|
|
settings:useAdminDisabledSummary="true" />
|
|
</PreferenceScreen>
|