diff options
author | Xiyuan Xia <xiyuan@google.com> | 2015-06-01 15:05:54 -0700 |
---|---|---|
committer | Xiyuan Xia <xiyuan@google.com> | 2015-06-01 15:10:08 -0700 |
commit | 6e2a039b1fd9216ae1652f80f6cd64ea23393c7c (patch) | |
tree | 4d6c0096b93151e6970ebb45d49d6025398fb240 /src/com/android/settings/ConfirmLockPattern.java | |
parent | dc6bd8d2f1b2b5f28d59d00ef178e64229ab59ef (diff) | |
download | packages_apps_Settings-6e2a039b1fd9216ae1652f80f6cd64ea23393c7c.zip packages_apps_Settings-6e2a039b1fd9216ae1652f80f6cd64ea23393c7c.tar.gz packages_apps_Settings-6e2a039b1fd9216ae1652f80f6cd64ea23393c7c.tar.bz2 |
Add announceForAccessibility to ConfirmLockPattern
This makes Talkback in ConfirmLockPattern works similarly as
in ConfirmLockPassword to read out error messages.
Bug:20282779
Change-Id: Ied05c284e959539cfbff965f33edd51c3bdfc9f9
Diffstat (limited to 'src/com/android/settings/ConfirmLockPattern.java')
-rw-r--r-- | src/com/android/settings/ConfirmLockPattern.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java index a7d0e4e..f53e7df 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: - mErrorTextView.setText(R.string.lockpattern_need_to_unlock_wrong); + showError(R.string.lockpattern_need_to_unlock_wrong); mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong); mLockPatternView.setEnabled(true); @@ -372,7 +372,6 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { } }; - private void handleAttemptLockout(long elapsedRealtimeDeadline) { updateStage(Stage.LockedOut); long elapsedRealtime = SystemClock.elapsedRealtime(); @@ -383,7 +382,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { @Override public void onTick(long millisUntilFinished) { final int secondsCountdown = (int) (millisUntilFinished / 1000); - mErrorTextView.setText(getString( + showError(getString( R.string.lockpattern_too_many_failed_confirmation_attempts, secondsCountdown)); } @@ -395,5 +394,14 @@ 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)); + } } } |