54d1cfdae0
Fixes flicker of toggle by setting not visible when launching confirm pin/pattern/password or enrollment prior to displaying FingerprintSettings. Also cleans up FingerprintSettings and security_settings_fingerprint.xml to better separate SFPS and non-SFPS logic and rename methods for clarity Test: (manual) navigate to sfps fp settings and observe toggle doesn’t flicker Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsUnlockCategoryControllerTest Fixes: 263843645 Change-Id: Ide3a666fc31b926ac14645dc22d090f77d81f901
51 lines
2.3 KiB
XML
51 lines
2.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2015 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-auto"
|
|
android:title="@string/security_settings_fingerprint_preference_title">
|
|
|
|
<PreferenceCategory
|
|
android:key="security_settings_fingerprints_enrolled"
|
|
settings:controller="com.android.settings.biometrics.fingerprint.FingerprintsEnrolledCategoryPreferenceController">
|
|
</PreferenceCategory>
|
|
|
|
<androidx.preference.Preference
|
|
android:key="key_fingerprint_add"
|
|
android:title="@string/fingerprint_add_title"
|
|
android:icon="@drawable/ic_add_24dp"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="security_settings_fingerprint_unlock_category"
|
|
android:title="@string/security_settings_fingerprint_settings_preferences_category"
|
|
settings:controller="com.android.settings.biometrics.fingerprint.FingerprintUnlockCategoryController"
|
|
settings:isPreferenceVisible="false">
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="security_settings_require_screen_on_to_auth"
|
|
android:title="@string/security_settings_require_screen_on_to_auth_title"
|
|
android:summary="@string/security_settings_require_screen_on_to_auth_description"
|
|
settings:keywords="@string/security_settings_require_screen_on_to_auth_keywords"
|
|
settings:controller="com.android.settings.biometrics.fingerprint.FingerprintSettingsRequireScreenOnToAuthPreferenceController" />
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="security_settings_fingerprint_footer">
|
|
</PreferenceCategory>
|
|
|
|
</PreferenceScreen>
|