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

Commit d9e92ea5 authored by Xiyuan Xia's avatar Xiyuan Xia Committed by Android (Google) Code Review
Browse files

Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev

parents fb32790a 4458fd6e

res/layout-land/confirm_lock_password.xml

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
            style="@style/TextAppearance.PasswordEntry"/>



        <TextView style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"

            android:accessibilityLiveRegion="polite"

            android:id="@+id/errorText"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

res/layout-land/confirm_lock_pattern.xml

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 


            <TextView

                style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"

                android:accessibilityLiveRegion="polite"

                android:id="@+id/errorText"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

res/layout/confirm_lock_password_base.xml

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 


    <TextView

        style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"

        android:accessibilityLiveRegion="polite"

        android:id="@+id/errorText"

        android:layout_width="wrap_content"

        android:layout_height="0dp"

res/layout/confirm_lock_pattern_base.xml

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 


        <TextView

            style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"

            android:accessibilityLiveRegion="polite"

            android:id="@+id/errorText"

            android:layout_width="wrap_content"

            android:layout_height="0dp"

src/com/android/settings/ConfirmLockPassword.java

+0 −1
Original line number Diff line number Diff line
@@ -377,7 +377,6 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 


        private void showError(CharSequence msg, long timeout) {

            mErrorTextView.setText(msg);

            mErrorTextView.announceForAccessibility(mErrorTextView.getText());

            mPasswordEntry.setText(null);

            mHandler.removeCallbacks(mResetErrorRunnable);

            if (timeout != 0) {