Files
app_Settings/res/xml/vpn_app_management.xml
Andre Lago f22679abbc Improved always_on_vpn disabled text
When the admin disallowed config vpn, always-on vpn description was
"Disabled by admin", so it was changed to "Controlled by admin" which
suits it better.

Bug: 29265180
Change-Id: If0da6b9ef3ce7179adeda53203c6caf4e3e9a995
2016-07-20 10:51:30 +01:00

43 lines
1.9 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:summaryOn="@string/vpn_always_on_active"
android:summaryOff="@string/vpn_always_on_inactive"
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>