da738b2edc
Cherry-pick from ag/1444396
1) Added a trampoline activity to display SET_NEW_PASSWORD intent.
2) On devices that have fingerprint sensor and have no enrolled fingerprint,
ChooseLockGeneric handles the SET_NEW_PASSWORD intent by providing
fingerprint + {PIN/PATTERN/PASSWORD} and skip fingerprint options.
Test: See below
1) Auto
make RunSettingsRoboTests
2) Manual
a) Fingerprint + pattern
i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
ii) Click Pixel Imprint + Pattern.
iii) Set a pattern lock.
iv) Can enroll a fingerprint.
b) Pattern
i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
ii) Click Continue without Pixel Imprint
iii) A list of unlock options, without fingerprint option, is shown.
vi) Select and enroll a pattern lock
c) Has an existing password
i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
ii) Setting app asks for password input.
iii) Enter password and click "Continue without Pixel imprint".
vi) No password is asked. A list of unlock options, without fingerprint option, is shown.
v) Select and enroll a pattern lock
d) Work profile
i) Create a work profile
ii) adb shell am start --user x -a android.app.action.SET_NEW_PASSWORD. X is the work profile user id.
iii) Click Pixel Imprint + Pattern.
iv) Set a pattern lock.
v) Can enroll a fingerprint.
Bug: 23017051
Change-Id: I6384bbffb72a5d3a83972da7474532746e4d06b9
56 lines
2.2 KiB
XML
56 lines
2.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2008 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_settings_picker_title"
|
|
android:key="lock_settings_picker">
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_off"
|
|
android:title="@string/unlock_set_unlock_off_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_none"
|
|
android:title="@string/unlock_set_unlock_none_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_pattern"
|
|
android:title="@string/unlock_set_unlock_pattern_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_pin"
|
|
android:title="@string/unlock_set_unlock_pin_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_password"
|
|
android:title="@string/unlock_set_unlock_password_title"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_set_managed"
|
|
android:persistent="false"/>
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="unlock_skip_fingerprint"
|
|
android:title="@string/fingerprint_unlock_skip_fingerprint"
|
|
android:persistent="false"/>
|
|
|
|
</PreferenceScreen>
|