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

Commit 0ced68ec authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Add scrollable text to biometric prompt" into sc-v2-dev am: 752334d0 

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

Change-Id: I4ee1e9cbf314a6af6a0da98aa057be48f89e24b8
parents aebaaa29 752334d0

packages/SystemUI/res/layout/auth_biometric_contents.xml

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ 
        android:accessibilityLiveRegion="polite"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:marqueeRepeatLimit="marquee_forever"

        android:scrollHorizontally="true"

        android:fadingEdge="horizontal"

        android:textColor="@color/biometric_dialog_gray"/>



    <LinearLayout

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

+1 −0
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ public abstract class AuthBiometricView extends LinearLayout { 
        mIndicatorView.setText(message);

        mIndicatorView.setTextColor(mTextColorError);

        mIndicatorView.setVisibility(View.VISIBLE);

        mIndicatorView.setSelected(true);

        mHandler.postDelayed(resetMessageRunnable, mInjector.getDelayAfterError());



        Utils.notifyAccessibilityContentChanged(mAccessibilityManager, this);