56462d668a
The setting to unify work and personal locks is now a toggle, and therefore always available. When unifying, if the work lock is sufficient as a device lock we confirm both locks and set the work lock as the device lock. If the work lock is not sufficient for the device, the user is informed and taken to the lock setup flow to set a new unified lock for both. Also fix related Strings given UX feedback. Bug: 26816580 Change-Id: Id019234b0a5ff4462c5f9ba86e53e30981a03e0d
28 lines
1.2 KiB
XML
28 lines
1.2 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/security_settings_title">
|
|
|
|
<SwitchPreference
|
|
android:key="unification"
|
|
android:title="@string/lock_settings_profile_unification_title"
|
|
android:summary="@string/lock_settings_profile_unification_summary"
|
|
settings:keywords="@string/keywords_unification"/>
|
|
|
|
</PreferenceScreen>
|