Merge "Enable VPN settings for secondary users" into mnc-dev
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 65b5d77..0f820f0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -323,7 +323,7 @@
</style>
<style name="TextAppearance.FingerprintErrorText"
- parent="android:TextAppearance.Material.Caption">
+ parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">@color/warning</item>
</style>
@@ -334,7 +334,7 @@
</style>
<style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
- parent="android:TextAppearance.Material.Caption">
+ parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">@color/warning</item>
</style>
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 481cf0f..087a23e 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -580,6 +580,7 @@
// 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 @@
case ChoiceTooShort:
mLockPatternView.setDisplayMode(DisplayMode.Wrong);
postClearPatternRunnable();
+ announceAlways = true;
break;
case FirstChoiceValid:
break;
@@ -600,6 +602,7 @@
case ConfirmWrong:
mLockPatternView.setDisplayMode(DisplayMode.Wrong);
postClearPatternRunnable();
+ announceAlways = true;
break;
case ChoiceConfirmed:
break;
@@ -607,7 +610,7 @@
// 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());
}
}