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

Commit 8793892b authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Automerger Merge Worker
Browse files

Merge "Improve a11y for BiometricPrompt credential view" into rvc-dev am: fc294e86 

Change-Id: Ie81da4fe99f34cff4f2254310864da94c844348d
parents 48629746 fc294e86

packages/SystemUI/res/values/styles.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -249,6 +249,7 @@ 
    <style name="TextAppearance.DeviceManagementDialog.Title" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>

    <style name="TextAppearance.DeviceManagementDialog.Title" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>





    <style name="TextAppearance.AuthCredential">

    <style name="TextAppearance.AuthCredential">

        <item name="android:accessibilityLiveRegion">polite</item>

        <item name="android:gravity">center_horizontal</item>

        <item name="android:gravity">center_horizontal</item>

        <item name="android:textAlignment">gravity</item>

        <item name="android:textAlignment">gravity</item>

        <item name="android:layout_gravity">top</item>

        <item name="android:layout_gravity">top</item>

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -214,9 +214,11 @@ public abstract class AuthCredentialView extends LinearLayout { 
    protected void onAttachedToWindow() {

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        super.onAttachedToWindow();





        setText(mTitleView, getTitle(mBiometricPromptBundle));

        final CharSequence title = getTitle(mBiometricPromptBundle);

        setText(mTitleView, title);

        setTextOrHide(mSubtitleView, getSubtitle(mBiometricPromptBundle));

        setTextOrHide(mSubtitleView, getSubtitle(mBiometricPromptBundle));

        setTextOrHide(mDescriptionView, getDescription(mBiometricPromptBundle));

        setTextOrHide(mDescriptionView, getDescription(mBiometricPromptBundle));

        announceForAccessibility(title);





        final boolean isManagedProfile = Utils.isManagedProfile(mContext, mEffectiveUserId);

        final boolean isManagedProfile = Utils.isManagedProfile(mContext, mEffectiveUserId);

        final Drawable image;

        final Drawable image;