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

Commit ca784dd5 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Use RestrictedPreference for all biometric settings." into sc-dev am:... 

Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd am: 1841f0f1

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

Change-Id: I9247aa39c6ca271175cd8634803935653aaf5e4e
parents 8a777b7c 1841f0f1

res/xml/security_dashboard_settings.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -153,17 +153,17 @@ 
            android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"

            android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"

            settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />

            settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />





        <Preference

        <com.android.settingslib.RestrictedPreference

            android:key="fingerprint_settings_profile"

            android:key="fingerprint_settings_profile"

            android:title="@string/security_settings_fingerprint_preference_title"

            android:title="@string/security_settings_fingerprint_preference_title"

            android:summary="@string/summary_placeholder" />

            android:summary="@string/summary_placeholder" />





        <Preference

        <com.android.settingslib.RestrictedPreference

            android:key="face_settings_profile"

            android:key="face_settings_profile"

            android:title="@string/security_settings_face_preference_title"

            android:title="@string/security_settings_face_preference_title"

            android:summary="@string/summary_placeholder" />

            android:summary="@string/summary_placeholder" />





        <Preference

        <com.android.settingslib.RestrictedPreference

            android:key="biometric_settings_profile"

            android:key="biometric_settings_profile"

            android:title="@string/security_settings_biometric_preference_title"

            android:title="@string/security_settings_biometric_preference_title"

            android:summary="@string/summary_placeholder" />

            android:summary="@string/summary_placeholder" />

res/xml/security_settings_combined_biometric.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,14 +26,14 @@ 
        android:key="biometric_ways_to_unlock"

        android:key="biometric_ways_to_unlock"

        android:title="@string/biometric_settings_category_ways_to_unlock">

        android:title="@string/biometric_settings_category_ways_to_unlock">





        <Preference

        <com.android.settingslib.RestrictedPreference

            android:key="biometric_face_settings"

            android:key="biometric_face_settings"

            android:title="@string/security_settings_face_preference_title"

            android:title="@string/security_settings_face_preference_title"

            android:summary="@string/summary_placeholder"

            android:summary="@string/summary_placeholder"

            settings:keywords="@string/keywords_face_settings"

            settings:keywords="@string/keywords_face_settings"

            settings:controller="com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController" />

            settings:controller="com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController" />





        <Preference

        <com.android.settingslib.RestrictedPreference

            android:key="biometric_fingerprint_settings"

            android:key="biometric_fingerprint_settings"

            android:title="@string/security_settings_fingerprint_preference_title"

            android:title="@string/security_settings_fingerprint_preference_title"

            android:summary="@string/summary_placeholder"

            android:summary="@string/summary_placeholder"

res/xml/security_settings_combined_biometric_profile.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,14 +26,14 @@ 
        android:key="biometric_ways_to_unlock"

        android:key="biometric_ways_to_unlock"

        android:title="@string/biometric_settings_category_ways_to_unlock">

        android:title="@string/biometric_settings_category_ways_to_unlock">





        <Preference

        <com.android.settingslib.RestrictedPreference

            android:key="biometric_fingerprint_settings_profile"

            android:key="biometric_fingerprint_settings_profile"

            android:title="@string/security_settings_fingerprint_preference_title"

            android:title="@string/security_settings_fingerprint_preference_title"

            android:summary="@string/summary_placeholder"

            android:summary="@string/summary_placeholder"

            settings:keywords="@string/keywords_fingerprint_settings"

            settings:keywords="@string/keywords_fingerprint_settings"

            settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />

            settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />





        <Preference

        <com.android.settingslib.RestrictedPreference

            android:key="biometric_face_settings_profile"

            android:key="biometric_face_settings_profile"

            android:title="@string/security_settings_face_preference_title"

            android:title="@string/security_settings_face_preference_title"

            android:summary="@string/summary_placeholder"

            android:summary="@string/summary_placeholder"

src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ public class CombinedBiometricStatusPreferenceController extends 
    @Override

    @Override

    public void displayPreference(PreferenceScreen screen) {

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        super.displayPreference(screen);

        mPreference = screen.findPreference(KEY_BIOMETRIC_SETTINGS);

        mPreference = screen.findPreference(mPreferenceKey);

    }

    }





    @Override

    @Override

src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon 
    @Override

    @Override

    public void displayPreference(PreferenceScreen screen) {

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        super.displayPreference(screen);

        mPreference = screen.findPreference(KEY_FACE_SETTINGS);

        mPreference = screen.findPreference(mPreferenceKey);

    }

    }





    @Override

    @Override