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

Unverified Commit fd95db5b authored by Bruno Martins's avatar Bruno Martins Committed by Michael Bestas
Browse files

FingerprintEnrollEnrolling: Set proper dialog message when user touches fp icon 

Change-Id: Iafd86e636b0c54bbddcf26d153cc671259391259
parent 2f415af2

res/values/cm_strings.xml

+11 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,17 @@ 
    <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="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>

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

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

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

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

    <string name="fingerprint_enroll_touch_dialog_message_rear" product="device">Touch the sensor on the back of your device.</string>

    <string name="fingerprint_enroll_touch_dialog_message_rear" product="default">Touch the sensor on the back of your phone.</string>

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

    <string name="fingerprint_enroll_touch_dialog_message_side" product="device">Touch the sensor on the side of your device.</string>

    <string name="fingerprint_enroll_touch_dialog_message_side" product="default">Touch the sensor on the side of your phone.</string>



    <!-- Navigation bar hint -->

    <!-- Navigation bar hint -->

    <string name="show_navbar_hint_title">Navigation hint</string>

    <string name="show_navbar_hint_title">Navigation hint</string>

    <string name="show_navbar_hint_summary">Show navigation hint bar at the bottom of the screen</string>

    <string name="show_navbar_hint_summary">Show navigation hint bar at the bottom of the screen</string>

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

+10 −1
Original line number Original line Diff line number Diff line
@@ -114,6 +114,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 




    private FingerprintManager mFingerprintManager;

    private FingerprintManager mFingerprintManager;

    private boolean mCanAssumeUdfps;

    private boolean mCanAssumeUdfps;

    private static boolean sCanAssumeSidefps;

    @Nullable private ProgressBar mProgressBar;

    @Nullable private ProgressBar mProgressBar;

    private ObjectAnimator mProgressAnim;

    private ObjectAnimator mProgressAnim;

    private TextView mDescriptionText;

    private TextView mDescriptionText;
@@ -147,6 +148,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
        final List<FingerprintSensorPropertiesInternal> props =

        final List<FingerprintSensorPropertiesInternal> props =

                mFingerprintManager.getSensorPropertiesInternal();

                mFingerprintManager.getSensorPropertiesInternal();

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

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

        sCanAssumeSidefps = props.size() == 1 && props.get(0).isAnySidefpsType();





        mAccessibilityManager = getSystemService(AccessibilityManager.class);

        mAccessibilityManager = getSystemService(AccessibilityManager.class);

        mIsAccessibilityEnabled = mAccessibilityManager.isEnabled();

        mIsAccessibilityEnabled = mAccessibilityManager.isEnabled();
@@ -734,9 +736,16 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 




        @Override

        @Override

        public Dialog onCreateDialog(Bundle savedInstanceState) {

        public Dialog onCreateDialog(Bundle savedInstanceState) {

            final boolean isFrontFacingFps = getResources().getBoolean(

                    R.bool.config_is_front_facing_fps);

            final String fpsLocation = getString(sCanAssumeSidefps

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



            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

            builder.setTitle(R.string.security_settings_fingerprint_enroll_touch_dialog_title)

            builder.setTitle(R.string.security_settings_fingerprint_enroll_touch_dialog_title)

                    .setMessage(R.string.security_settings_fingerprint_enroll_touch_dialog_message)

                    .setMessage(fpsLocation)

                    .setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,

                    .setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,

                            new DialogInterface.OnClickListener() {

                            new DialogInterface.OnClickListener() {

                                @Override

                                @Override