PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1 am: abdd8bcccc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: I42c288d653bb1a22cfa910b94b37f595644d2b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Grace Cheng
2023-04-27 03:19:36 +00:00
committed by Automerger Merge Worker
parent 393917e9e6 abdd8bcccc
commit c1e5cc8891
7 changed files with 357 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/xml/security_settings_fingerprint.xml
View File

@@ -19,10 +19,21 @@
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.FingerprintUnlockCategoryPreferenceController">
settings:controller="com.android.settings.biometrics.fingerprint.FingerprintUnlockCategoryController"
settings:isPreferenceVisible="false">
<com.android.settingslib.RestrictedSwitchPreference
android:key="security_settings_require_screen_on_to_auth"
@@ -32,4 +43,8 @@
settings:controller="com.android.settings.biometrics.fingerprint.FingerprintSettingsRequireScreenOnToAuthPreferenceController" />
</PreferenceCategory>
<PreferenceCategory
android:key="security_settings_fingerprint_footer">
</PreferenceCategory>
</PreferenceScreen>