Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e6e4a1a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "biometric_page" into sc-dev 

* changes:
  Update confirming credential flow for biometric settings
  Combined biometric settings implementation
parents 10da1de1 8843157b

AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -494,6 +494,22 @@ 
                       android:value="com.android.settings.biometrics.fingerprint.FingerprintSettings$FingerprintSettingsFragment" />

        </activity>



        <activity android:name="Settings$CombinedBiometricSettingsActivity"

                  android:label="@string/security_settings_biometric_preference_title"

                  android:theme="@style/Theme.SubSettings"

                  android:exported="false">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.biometrics.combination.CombinedBiometricSettings" />

        </activity>



        <activity android:name="Settings$CombinedBiometricProfileSettingsActivity"

                  android:label="@string/security_settings_biometric_preference_title"

                  android:theme="@style/Theme.SubSettings"

                  android:exported="false">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.biometrics.combination.CombinedBiometricProfileSettings" />

        </activity>



        <activity android:name=".bluetooth.DevicePickerActivity"

                android:label="@string/device_picker"

                android:configChanges="orientation|keyboardHidden|screenSize"

res/values/strings.xml

+20 −0
Original line number Diff line number Diff line
@@ -969,6 +969,22 @@ 
    <!-- Message shown in fingerprint security settings home screen. [CHAR LIMIT=NONE]-->

    <string name="security_settings_fingerprint_v2_home_screen">Use your fingerprint to unlock your phone or for authentication, like when you sign in to apps or approve a purchase\n\n<annotation id="url">Learn more</annotation></string>









    <!-- Biometric settings --><skip />









    <!-- Title shown for menu item that launches biometric settings. [CHAR LIMIT=66] -->









    <string name="security_settings_biometric_preference_title">Face &amp; fingerprint unlock</string>









    <!-- Message shown in summary field of biometric settings. [CHAR LIMIT=66] -->









    <string name="security_settings_biometric_preference_summary">Face and fingerprint</string>









    <!-- Introduction shown in face and fingerprint page to introduce the biometric feature. [CHAR LIMIT=NONE]-->









    <string name="biometric_settings_intro">When you set up face unlock and fingerprint, your phone will ask for your fingerprint when you wear a mask or are in a dark area.</string>









    <!-- Biometric category title - biometric options for unlocking the device. [CHAR LIMIT=50] -->









    <string name="biometric_settings_category_ways_to_unlock">Ways to unlock</string>









    <!-- Biometric category title - configuration options for using biometric to unlock the device or authenticate in apps. [CHAR LIMIT=50] -->









    <string name="biometric_settings_category_ways_to_use">Use face and fingerprint to</string>









    <!-- Text shown on a toggle which allows or disallows the device to use biometric for unlocking the device. [CHAR LIMIT=20] -->









    <string name="biometric_settings_use_biometric_unlock_phone">Unlocking your phone</string>









    <!-- Text shown on a toggle which allows or disallows the device to use biometric for authentication. [CHAR LIMIT=30] -->









    <string name="biometric_settings_use_biometric_for_apps">Authentication in apps</string>

















    <!-- Title of dialog shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so [CHAR LIMIT=30]-->









    <string name="lock_screen_intro_skip_title">Skip screen lock?</string>









    <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so, including loss of factory reset protection. (tablet) [CHAR LIMIT=NONE] -->








@@ -8062,6 +8078,7 @@







    <string name="keywords_backup">backup, back up</string>









    <string name="keywords_assist_gesture_launch">gesture</string>









    <string name="keywords_face_unlock">face, unlock, auth, sign in</string>









    <string name="keywords_biometric_unlock">face, unlock, auth, sign in, fingerprint, biometric</string>









    <string name="keywords_imei_info">imei, meid, min, prl version, imei sv</string>









    <string name="keywords_sim_status">network, mobile network state, service state, signal strength, mobile network type, roaming, iccid, eid</string>









    <string name="keywords_model_and_hardware">serial number, hardware version</string>








@@ -8087,6 +8104,9 @@







    <!-- Search keyword for fingerprint settings. [CHAR_LIMIT=NONE]-->









    <string name="keywords_fingerprint_settings">fingerprint, add fingerprint</string>

















    <!-- Search keyword for biometric settings. [CHAR_LIMIT=NONE]-->









    <string name="keywords_biometric_settings">face, fingerprint, add fingerprint</string>

















    <!-- Search keywords for adaptive brightness setting [CHAR LIMIT=NONE]-->









    <string name="keywords_display_auto_brightness">dim screen, touchscreen, battery, smart brightness, dynamic brightness, Auto brightness</string>

































res/xml/security_dashboard_settings.xml



+11
−0






























Original line number
Diff line number
Diff line







@@ -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
































res/xml/security_settings_combined_biometric.xml
0 → 100644



+69
−0






























Original line number
Diff line number
Diff line









<?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>








 No newline at end of file
























res/xml/security_settings_combined_biometric_profile.xml
0 → 100644



+56
−0






























Original line number
Diff line number
Diff line









<?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>








 No newline at end of file