From b2aaa26f3851a3e9e9f937be43a24663c04b6546 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 28 May 2019 17:58:07 -0700 Subject: [PATCH] Add setting to bypass lock screen Test: manual Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockscreenBypassPreferenceControllerTest Bug: 130327302 Change-Id: I324c6e384480fa8576ba58d0bf73c1ef20484ee0 --- res/values/strings.xml | 9 +++ res/xml/privacy_dashboard_settings.xml | 8 ++ res/xml/security_lockscreen_settings.xml | 7 ++ .../LockscreenBypassPreferenceController.java | 59 ++++++++++++++ ...kscreenBypassPreferenceControllerTest.java | 77 +++++++++++++++++++ 5 files changed, 160 insertions(+) create mode 100644 src/com/android/settings/security/LockscreenBypassPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/security/LockscreenBypassPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index c84f51da8aa..128ff617341 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7976,6 +7976,15 @@ Lock screen + + Skip lock screen + + + After face unlock, go directly to last used screen + + + Lock screen, Lockscreen, Skip, Bypass + When work profile is locked diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml index aa789b90424..7057ec570b9 100644 --- a/res/xml/privacy_dashboard_settings.xml +++ b/res/xml/privacy_dashboard_settings.xml @@ -62,6 +62,14 @@ android:summary="@string/summary_placeholder" settings:searchable="false"/> + + + + +