From 4458fd6e57e39a8008a2d7de4014357288c134cb Mon Sep 17 00:00:00 2001
From: Xiyuan Xia <xiyuan@google.com>
Date: Tue, 2 Jun 2015 15:21:51 -0700
Subject: [PATCH] Use accessibilityLiveRegion for ConfirmLockPassword/Pattern
 errorText

- Revert previous "Add announceForAccessibility to ConfirmLockPattern";
- Add android:accessibilityLiveRegion="polite" for errorText in
  ConfirmLockPassword/Pattern;

Bug:20282779
Change-Id: I4b9c0d461d0dd0504bd88a8a2144e09a42d5f64e
---
 res/layout-land/confirm_lock_password.xml         |  1 +
 res/layout-land/confirm_lock_pattern.xml          |  1 +
 res/layout/confirm_lock_password_base.xml         |  1 +
 res/layout/confirm_lock_pattern_base.xml          |  1 +
 src/com/android/settings/ConfirmLockPassword.java |  1 -
 src/com/android/settings/ConfirmLockPattern.java  | 13 ++-----------
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index d8da8fee070..0d46bfa94b3 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 0567fad051e..329f52a218e 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 8b025eeaebe..069708f1eed 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 029b85645ec..cd2cbef03a2 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 4e32a83ba80..db0b44ad9a3 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -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) {
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index f53e7df9d13..90a39f9adfd 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -208,7 +208,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                     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 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                 @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 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                 }
             }.start();
         }
-
-        private void showError(CharSequence msg) {
-            mErrorTextView.setText(msg);
-            mErrorTextView.announceForAccessibility(mErrorTextView.getText());
-        }
-
-        private void showError(int msgid) {
-            showError(getText(msgid));
-        }
     }
 }