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

Commit d565e973 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 19f99a92 b1540f23

res/values/cm_strings.xml

+4 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2017-2022 The LineageOS Project

     Copyright (C) 2017-2023 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -102,6 +102,9 @@ 
    <string name="fingerprint_enroll_find_sensor_message_rear" product="tablet">Locate the fingerprint sensor on the back of your tablet.</string>

    <string name="fingerprint_enroll_find_sensor_message_rear" product="device">Locate the fingerprint sensor on the back of your device.</string>

    <string name="fingerprint_enroll_find_sensor_message_rear" product="default">Locate the fingerprint sensor on the back of your phone.</string>

    <string name="fingerprint_enroll_find_sensor_message_side" product="tablet">Locate the fingerprint sensor on the side of your tablet.</string>

    <string name="fingerprint_enroll_find_sensor_message_side" product="device">Locate the fingerprint sensor on the side of your device.</string>

    <string name="fingerprint_enroll_find_sensor_message_side" product="default">Locate the fingerprint sensor on the side of your phone.</string>



    <!-- Message shown when user touches the icon on the screen, instead of the real fingerprint sensor -->

    <string name="fingerprint_enroll_touch_dialog_message_front" product="tablet">Touch the sensor on the front of your tablet.</string>

res/values/lineage_config.xml

+5 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2020-2022 The LineageOS Project

     Copyright (C) 2020-2023 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -18,6 +18,10 @@ 
    <!-- Indicates whether device has a front facing fingerprint sensor (not udfps). -->

    <bool name="config_is_front_facing_fps" translatable="false">false</bool>



    <!-- Indicates whether device has a side mounted fingerprint sensor,

         but a dedicated one, i.e. not embedded in the power button. -->

    <bool name="config_is_side_fps" translatable="false">false</bool>



    <string-array name="config_ignored_backup_transports" translatable="false">

        <item>com.android.localtransport/.LocalTransport</item>

    </string-array>

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

+3 −3
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
    private FingerprintManager mFingerprintManager;

    private boolean mCanAssumeUdfps;

    private boolean mCanAssumeSfps;

    private static boolean sCanAssumeSfps;

    @Nullable private ProgressBar mProgressBar;

    private ObjectAnimator mProgressAnim;

    private TextView mErrorText;
@@ -235,7 +234,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
                mFingerprintManager.getSensorPropertiesInternal();

        mCanAssumeUdfps = props != null && props.size() == 1 && props.get(0).isAnyUdfpsType();

        mCanAssumeSfps = props != null && props.size() == 1 && props.get(0).isAnySidefpsType();

        sCanAssumeSfps = mCanAssumeSfps;



        mAccessibilityManager = getSystemService(AccessibilityManager.class);

        mIsAccessibilityEnabled = mAccessibilityManager.isEnabled();
@@ -1090,7 +1088,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
        public Dialog onCreateDialog(Bundle savedInstanceState) {

            final boolean isFrontFacingFps = getResources().getBoolean(

                    R.bool.config_is_front_facing_fps);

            final String fpsLocation = getString(sCanAssumeSfps

            final boolean isSideMountedFps = getResources().getBoolean(

                    R.bool.config_is_side_fps);

            final String fpsLocation = getString(isSideMountedFps

                    ? R.string.fingerprint_enroll_touch_dialog_message_side : isFrontFacingFps

                            ? R.string.fingerprint_enroll_touch_dialog_message_front

                            : R.string.fingerprint_enroll_touch_dialog_message_rear);

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

+6 −1
Original line number Diff line number Diff line
@@ -124,9 +124,14 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
            mIsReverseDefaultRotation = getApplicationContext().getResources().getBoolean(

                    com.android.internal.R.bool.config_reverseDefaultRotation);

        } else {

            // Remaining usecases can be either front facing fps or dedicated

            // side mounted fps (not embedded in the power button)

            final boolean isFrontFacingFps = getResources().getBoolean(

                    R.bool.config_is_front_facing_fps);

            final String fpsLocation = getString(isFrontFacingFps

            final boolean isSideMountedFps = getResources().getBoolean(

                    R.bool.config_is_side_fps);

            final String fpsLocation = getString(isSideMountedFps

                    ? R.string.fingerprint_enroll_find_sensor_message_side : isFrontFacingFps

                            ? R.string.fingerprint_enroll_find_sensor_message_front

                            : R.string.fingerprint_enroll_find_sensor_message_rear);