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

Commit e11ee153 authored by Austin Delgado's avatar Austin Delgado
Browse files

Update hint action for canceling face auth in BP 

Fixes: 289019193
Test: Manual, verify expected string is spoken as hint when cancel auth
button is focused

Change-Id: I363d57f51e0e071f106a69c4265dcad04344a851
parent b75d6844

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ 
    <string name="biometric_dialog_tap_confirm_with_face_alt_3">Face recognized. Press the unlock icon to continue.</string>

    <!-- Talkback string when a biometric is authenticated [CHAR LIMIT=NONE] -->

    <string name="biometric_dialog_authenticated">Authenticated</string>

    <!-- Talkback string when a canceling authentication [CHAR LIMIT=NONE] -->

    <string name="biometric_dialog_cancel_authentication">Cancel Authentication</string>



    <!-- Button text shown on BiometricPrompt giving the user the option to use an alternate form of authentication (Pin) [CHAR LIMIT=30] -->

    <string name="biometric_dialog_use_pin">Use PIN</string>

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+18 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ import android.widget.ScrollView; 
import android.window.OnBackInvokedCallback;

import android.window.OnBackInvokedDispatcher;



import androidx.core.view.AccessibilityDelegateCompat;

import androidx.core.view.ViewCompat;

import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;



import com.android.app.animation.Interpolators;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.jank.InteractionJankMonitor;
@@ -333,6 +337,20 @@ public class AuthContainerView extends LinearLayout 
        addView(mFrameLayout);

        mBiometricScrollView = mFrameLayout.findViewById(R.id.biometric_scrollview);

        mBackgroundView = mFrameLayout.findViewById(R.id.background);

        ViewCompat.setAccessibilityDelegate(mBackgroundView, new AccessibilityDelegateCompat() {

            @Override

            public void onInitializeAccessibilityNodeInfo(View host,

                    AccessibilityNodeInfoCompat info) {

                super.onInitializeAccessibilityNodeInfo(host, info);

                info.addAction(

                        new AccessibilityNodeInfoCompat.AccessibilityActionCompat(

                                AccessibilityNodeInfoCompat.ACTION_CLICK,

                                mContext.getString(R.string.biometric_dialog_cancel_authentication)

                        )

                );

            }

        });



        mPanelView = mFrameLayout.findViewById(R.id.panel);

        mPanelController = new AuthPanelController(mContext, mPanelView);

        mBackgroundExecutor = bgExecutor;