diff options
| author | Jason Monk <jmonk@google.com> | 2014-06-19 10:33:41 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2014-06-26 11:09:54 -0400 |
| commit | 315070d58b1d18fe1f5dae73e2ee09fd3ee5b13f (patch) | |
| tree | 519cb2c4caf49fed53170976841ff023b942b905 /res/xml | |
| parent | 8b2655cfbb77ef696ad4cec0f8861889a2015917 (diff) | |
| download | packages_apps_Settings-315070d58b1d18fe1f5dae73e2ee09fd3ee5b13f.zip packages_apps_Settings-315070d58b1d18fe1f5dae73e2ee09fd3ee5b13f.tar.gz packages_apps_Settings-315070d58b1d18fe1f5dae73e2ee09fd3ee5b13f.tar.bz2 | |
Add lock-to-app to settings
Lock-to-app when disabled shows some instructions about how to
enable it and use it.
When enabled shows an option of use lock screen, which controls
whether the device is locked when exiting lock-to-app. Turning
on use lock screen requires that the device have some security
challenge.
Bug: 15759649
Change-Id: I6188243e03fb0c85bdfdbc32a23ad486296a34f9
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/lock_to_app_settings.xml | 26 | ||||
| -rw-r--r-- | res/xml/security_settings_misc.xml | 6 |
2 files changed, 32 insertions, 0 deletions
diff --git a/res/xml/lock_to_app_settings.xml b/res/xml/lock_to_app_settings.xml new file mode 100644 index 0000000..f9a0b6c --- /dev/null +++ b/res/xml/lock_to_app_settings.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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" + android:title="@string/lock_to_app_title" + xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> + + <SwitchPreference + android:key="use_screen_lock" + android:title="@string/lock_to_app_screen_lock" + android:persistent="false" /> + +</PreferenceScreen> diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml index c8f3e02..0dbddea 100644 --- a/res/xml/security_settings_misc.xml +++ b/res/xml/security_settings_misc.xml @@ -102,4 +102,10 @@ android:persistent="false" android:fragment="com.android.settings.AdvancedSecuritySettings"/> </PreferenceCategory> + + <PreferenceScreen + android:key="lock_to_app_settings" + android:fragment="com.android.settings.LockToAppSettings" + android:title="@string/lock_to_app_title"/> + </PreferenceScreen> |