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

Commit 36b0610e authored by Austin Delgado's avatar Austin Delgado Committed by Automerger Merge Worker
Browse files

Merge "Update hint action for canceling face auth in BP" into udc-d1-dev am:... 

Merge "Update hint action for canceling face auth in BP" into udc-d1-dev am: 04158cf7 am: d85d5889

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24044776



Change-Id: I6ee24cf183f5cef00192986abc162483f429d629
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea3ad8e4 d85d5889

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -369,6 +369,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;