summaryrefslogtreecommitdiffstats
path: root/res/xml/screen_pinning_settings.xml
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2014-08-04 16:08:51 -0400
committerJason Monk <jmonk@google.com>2014-10-31 15:45:12 -0400
commit78121d9d106f12f2b2bae53d323e89667dbdfeee (patch)
tree6d7f74ecfb6c7bd0a4f2a024094a6a2041b907dc /res/xml/screen_pinning_settings.xml
parent6f5b23f3fc4855c1906fd64fd3bcb9d5f14a02a2 (diff)
downloadpackages_apps_Settings-78121d9d106f12f2b2bae53d323e89667dbdfeee.zip
packages_apps_Settings-78121d9d106f12f2b2bae53d323e89667dbdfeee.tar.gz
packages_apps_Settings-78121d9d106f12f2b2bae53d323e89667dbdfeee.tar.bz2
Bring screen lock setting back to screen pinning
The material design of the request has removed this option from the dialog, and now needs to be in settings. When screen pinning is off it shows a description of how to use the feature, however when on it shows a switch to control whether it locks the device on exit. This setting defaults to on if there is a lock pin/pattern. Bug: 16957435 Change-Id: I59e0d64964cee4302e6ecff59e622cfe11422807
Diffstat (limited to 'res/xml/screen_pinning_settings.xml')
-rw-r--r--res/xml/screen_pinning_settings.xml25
1 files changed, 25 insertions, 0 deletions
diff --git a/res/xml/screen_pinning_settings.xml b/res/xml/screen_pinning_settings.xml
new file mode 100644
index 0000000..6727687
--- /dev/null
+++ b/res/xml/screen_pinning_settings.xml
@@ -0,0 +1,25 @@
+<?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/screen_pinning_title">
+
+ <SwitchPreference
+ android:key="use_screen_lock"
+ android:title="@string/screen_pinning_unlock_none"
+ android:persistent="false" />
+
+</PreferenceScreen>