PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add announceForAccessibility to ConfirmLockPattern

Browse Source 
This makes Talkback in ConfirmLockPattern works similarly as
in ConfirmLockPassword to read out error messages.

Bug:20282779
Change-Id: Ied05c284e959539cfbff965f33edd51c3bdfc9f9
This commit is contained in:
Xiyuan Xia
2015-06-01 15:05:54 -07:00
parent dc6bd8d2f1
commit 6e2a039b1f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/ConfirmLockPattern.java
View File

@@ -208,7 +208,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
mLockPatternView.clearPattern(); mLockPatternView.clearPattern();
break; break;
case NeedToUnlockWrong: 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.setDisplayMode(LockPatternView.DisplayMode.Wrong);
mLockPatternView.setEnabled(true); mLockPatternView.setEnabled(true);
@@ -372,7 +372,6 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
} }
}; };
private void handleAttemptLockout(long elapsedRealtimeDeadline) { private void handleAttemptLockout(long elapsedRealtimeDeadline) {
updateStage(Stage.LockedOut); updateStage(Stage.LockedOut);
long elapsedRealtime = SystemClock.elapsedRealtime(); long elapsedRealtime = SystemClock.elapsedRealtime();
@@ -383,7 +382,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
@Override @Override
public void onTick(long millisUntilFinished) { public void onTick(long millisUntilFinished) {
final int secondsCountdown = (int) (millisUntilFinished / 1000); final int secondsCountdown = (int) (millisUntilFinished / 1000);
mErrorTextView.setText(getString( showError(getString(
R.string.lockpattern_too_many_failed_confirmation_attempts, R.string.lockpattern_too_many_failed_confirmation_attempts,
secondsCountdown)); secondsCountdown));
} }
@@ -395,5 +394,14 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
} }
}.start(); }.start();
} }
private void showError(CharSequence msg) {
mErrorTextView.setText(msg);
mErrorTextView.announceForAccessibility(mErrorTextView.getText());
}
private void showError(int msgid) {
showError(getText(msgid));
}
} }
} }