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

am 30d6b2b8: Merge "Always announcing wrong pattern now for talkback in pattern settings" into mnc-dev

Browse Source 
* commit '30d6b2b8f119cd503577303e3a80313418753333':
  Always announcing wrong pattern now for talkback in pattern settings
This commit is contained in:
Selim Cinek
2015-06-25 22:34:36 +00:00
committed by Android Git Automerger
parent cf1e2a12c1 30d6b2b8f1
commit 74dae06fa3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/ChooseLockPattern.java
View File

@@ -580,6 +580,7 @@ public class ChooseLockPattern extends SettingsActivity {
// the rest of the stuff varies enough that it is easier just to handle
// on a case by case basis.
mLockPatternView.setDisplayMode(DisplayMode.Correct);
boolean announceAlways = false;
switch (mUiStage) {
case Introduction:
@@ -591,6 +592,7 @@ public class ChooseLockPattern extends SettingsActivity {
case ChoiceTooShort:
mLockPatternView.setDisplayMode(DisplayMode.Wrong);
postClearPatternRunnable();
announceAlways = true;
break;
case FirstChoiceValid:
break;
@@ -600,6 +602,7 @@ public class ChooseLockPattern extends SettingsActivity {
case ConfirmWrong:
mLockPatternView.setDisplayMode(DisplayMode.Wrong);
postClearPatternRunnable();
announceAlways = true;
break;
case ChoiceConfirmed:
break;
@@ -607,7 +610,7 @@ public class ChooseLockPattern extends SettingsActivity {
// If the stage changed, announce the header for accessibility. This
// is a no-op when accessibility is disabled.
if (previousStage != stage) {
if (previousStage != stage || announceAlways) {
mHeaderText.announceForAccessibility(mHeaderText.getText());
}
}