Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 76fdafc..587bc6a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -831,6 +831,12 @@
<string name="crypt_keeper_dialog_need_password_message">You need to set a lock screen PIN or
password before you can start encryption.</string>
+ <!-- String at bottom of screen when prompting for pattern.
+ Note: This is only for the pattern case. -->
+ <string name="crypt_keeper_confirm_encrypt">
+ You need to draw your unlock pattern to confirm encrypting your device.
+ </string>
+
<!-- Title of the final confirmation screen before starting device encryption -->
<string name="crypt_keeper_confirm_title">Encrypt?</string>
<!-- Warning text in the final confirmation screen before starting device encryption -->
@@ -5778,8 +5784,8 @@
<!-- [CHAR LIMIT=30] Zen mode settings: From option value: Starred contacts -->
<string name="zen_mode_from_starred">Starred contacts only</string>
- <!-- [CHAR LIMIT=60] Zen mode settings: Reminder text about alarms -->
- <string name="zen_mode_alarm_info">Alarms are always priority interruptions</string>
+ <!-- [CHAR LIMIT=80] Zen mode settings: Reminder text about alarms -->
+ <string name="zen_mode_alarm_info">Alarms and other personal reminders are priority interruptions</string>
<!-- [CHAR LIMIT=20] Zen mode settings: When option -->
<string name="zen_mode_when">Automatically turn on</string>
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index 45df8ba..c572738 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -164,7 +164,7 @@
return helper.launchConfirmationActivity(request,
res.getText(R.string.master_clear_gesture_prompt),
- res.getText(R.string.master_clear_gesture_explanation),
+ res.getText(R.string.crypt_keeper_confirm_encrypt),
true);
}