Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index d8da8fe..0d46bfa 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -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"
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 0567fad..329f52a 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -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"
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 8b025ee..069708f 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -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"
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index 029b856..cd2cbef 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -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"
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 4e32a83b..db0b44a 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -377,7 +377,6 @@
private void showError(CharSequence msg, long timeout) {
mErrorTextView.setText(msg);
- mErrorTextView.announceForAccessibility(mErrorTextView.getText());
mPasswordEntry.setText(null);
mHandler.removeCallbacks(mResetErrorRunnable);
if (timeout != 0) {
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index f53e7df..90a39f9 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -208,7 +208,7 @@
mLockPatternView.clearPattern();
break;
case NeedToUnlockWrong:
- showError(R.string.lockpattern_need_to_unlock_wrong);
+ mErrorTextView.setText(R.string.lockpattern_need_to_unlock_wrong);
mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
mLockPatternView.setEnabled(true);
@@ -382,7 +382,7 @@
@Override
public void onTick(long millisUntilFinished) {
final int secondsCountdown = (int) (millisUntilFinished / 1000);
- showError(getString(
+ mErrorTextView.setText(getString(
R.string.lockpattern_too_many_failed_confirmation_attempts,
secondsCountdown));
}
@@ -394,14 +394,5 @@
}
}.start();
}
-
- private void showError(CharSequence msg) {
- mErrorTextView.setText(msg);
- mErrorTextView.announceForAccessibility(mErrorTextView.getText());
- }
-
- private void showError(int msgid) {
- showError(getText(msgid));
- }
}
}