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

Merge changes from topic "biometric_page" into sc-dev

Browse Source 
* changes:
  Update confirming credential flow for biometric settings
  Combined biometric settings implementation
This commit is contained in:
TreeHugger Robot
2021-04-23 08:50:29 +00:00
committed by Android (Google) Code Review
parent 10da1de13e 8843157b01
commit 3e6e4a1ad5
28 changed files with 1027 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/xml/security_dashboard_settings.xml
View File

@@ -55,6 +55,12 @@
android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_face_settings" />
<Preference
android:key="biometric_settings"
android:title="@string/security_settings_biometric_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_biometric_settings" />
</PreferenceCategory>
<!-- work profile security section -->
@@ -91,6 +97,11 @@
android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder" />
<Preference
android:key="biometric_settings_profile"
android:title="@string/security_settings_biometric_preference_title"
android:summary="@string/summary_placeholder" />
</PreferenceCategory>
<PreferenceCategory

69
res/xml/security_settings_combined_biometric.xml Normal file
View File

@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2021 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_biometric_preference_title">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/biometric_settings_intro" />
<PreferenceCategory
android:key="biometric_ways_to_unlock"
android:title="@string/biometric_settings_category_ways_to_unlock">
<Preference
android:key="biometric_fingerprint_settings"
android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_fingerprint_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintStatusPreferenceController" />
<Preference
android:key="biometric_face_settings"
android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_face_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController" />
</PreferenceCategory>
<PreferenceCategory
android:key="biometric_ways_to_use"
android:title="@string/biometric_settings_category_ways_to_use">
<com.android.settingslib.RestrictedSwitchPreference
android:key="biometric_settings_biometric_keyguard"
android:title="@string/biometric_settings_use_biometric_unlock_phone"
settings:keywords="@string/keywords_biometric_unlock"
settings:controller="com.android.settings.biometrics.combination.BiometricSettingsKeyguardPreferenceController"/>
<SwitchPreference
android:key="biometric_settings_biometric_app"
android:title="@string/biometric_settings_use_biometric_for_apps"
settings:keywords="@string/keywords_biometric_unlock"
settings:controller="com.android.settings.biometrics.combination.BiometricSettingsAppPreferenceController"/>
</PreferenceCategory>
<SwitchPreference
android:key="biometric_setting_lockdown_enabled"
android:title="@string/lockdown_settings_title"
android:summary="@string/lockdown_settings_summary"
settings:controller="com.android.settings.security.LockdownButtonPreferenceController" />
</PreferenceScreen>

56
res/xml/security_settings_combined_biometric_profile.xml Normal file
View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2021 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_biometric_preference_title">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/biometric_settings_intro" />
<PreferenceCategory
android:key="biometric_ways_to_unlock"
android:title="@string/biometric_settings_category_ways_to_unlock">
<Preference
android:key="biometric_fingerprint_settings_profile"
android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_fingerprint_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
<Preference
android:key="biometric_face_settings_profile"
android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_face_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFaceProfileStatusPreferenceController" />
</PreferenceCategory>
<PreferenceCategory
android:key="biometric_ways_to_use"
android:title="@string/biometric_settings_category_ways_to_use">
<SwitchPreference
android:key="biometric_settings_biometric_app_profile"
android:title="@string/biometric_settings_use_biometric_for_apps"
settings:keywords="@string/keywords_biometric_unlock"
settings:controller="com.android.settings.biometrics.combination.BiometricSettingsAppPreferenceController"/>
</PreferenceCategory>
</PreferenceScreen>

10
res/xml/security_settings_face.xml
View File

@@ -31,7 +31,8 @@
<PreferenceCategory
android:key="security_settings_face_unlock_category"
android:title="@string/security_settings_face_settings_use_face_category">
android:title="@string/security_settings_face_settings_use_face_category"
settings:controller="com.android.settings.biometrics.face.FaceUnlockCategoryPreferenceController">
<com.android.settingslib.RestrictedSwitchPreference
android:key="security_settings_face_keyguard"
android:title="@string/security_settings_face_settings_use_face_unlock_phone"
@@ -66,6 +67,13 @@
android:summary="@string/security_settings_face_settings_require_confirmation_details"
settings:keywords="@string/keywords_face_unlock"
settings:controller="com.android.settings.biometrics.face.FaceSettingsConfirmPreferenceController"/>
<com.android.settingslib.RestrictedSwitchPreference
android:key="biometric_settings_lockscreen_bypass"
android:title="@string/lockscreen_bypass_title"
android:summary="@string/lockscreen_bypass_summary"
settings:keywords="@string/keywords_lockscreen_bypass"
settings:controller="com.android.settings.biometrics.face.FaceSettingsLockscreenBypassPreferenceController" />
</PreferenceCategory>
<PreferenceCategory