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

1 files changed, 2 insertions, 11 deletions

diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index f53e7df9d1..90a39f9adf 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));
-        }
     }
 }