Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ce7a211..e73825e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3676,18 +3676,18 @@
your device won’t use your screen lock to enhance data encryption.</string>
<!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
- <string name="enable_service_pattern_reason">Turning on <xliff:g id="service"
- example="TalkBack">%1$s</xliff:g> reduces data protection.
+ <string name="enable_service_pattern_reason">Because turning on <xliff:g id="service"
+ example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your pattern.
</string>
<!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
- <string name="enable_service_pin_reason">Turning on <xliff:g id="service"
- example="TalkBack">%1$s</xliff:g> reduces data protection.
+ <string name="enable_service_pin_reason">Because turning on <xliff:g id="service"
+ example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your PIN.
</string>
<!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
- <string name="enable_service_password_reason">Turning on <xliff:g id="service"
- example="TalkBack">%1$s</xliff:g> reduces data protection.
+ <string name="enable_service_password_reason">Because turning on <xliff:g id="service"
+ example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your password.
</string>
<!-- Title for the capability of an accessibility service to receive events and keys. -->
@@ -5932,11 +5932,20 @@
<string name="encryption_continue_button">Continue</string>
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
- <string name="encryption_interstitial_message_pin">Because your device is encrypted, you can further protect it by requiring that you enter your PIN before your device starts up.</string>
+ <string name="encryption_interstitial_message_pin">
+ You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\'t receive calls, messages, or notifications, including alarms.
+ \n\nThis helps protect data on lost or stolen devices.
+ </string>
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
- <string name="encryption_interstitial_message_pattern">Because your device is encrypted, you can further protect it by requiring that you enter your pattern before your device starts up.</string>
+ <string name="encryption_interstitial_message_pattern">
+ You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\'t receive calls, messages, or notifications, including alarms.
+ \n\nThis helps protect data on lost or stolen devices.
+ </string>
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
- <string name="encryption_interstitial_message_password">Because your device is encrypted, you can further protect it by requiring that you enter your password before your device starts up.</string>
+ <string name="encryption_interstitial_message_password">
+ You can further protect this device by requiring your password before it starts up. Until the device starts up, it can\'t receive calls, messages, or notifications, including alarms.
+ \n\nThis helps protect data on lost or stolen devices.
+ </string>
<!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->
<string name="encrypt_require_pin">Require PIN to start device</string>
@@ -5952,4 +5961,22 @@
<!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->
<string name="encrypt_dont_require_password">No thanks</string>
+ <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+ <string name="encrypt_talkback_dialog_require_pin">Require PIN?</string>
+
+ <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+ <string name="encrypt_talkback_dialog_require_pattern">Require pattern?</string>
+
+ <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+ <string name="encrypt_talkback_dialog_require_password">Require password?</string>
+
+ <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+ <string name="encrypt_talkback_dialog_message_pin">When you enter your PIN to start this device, accessibility services like Talkback won\'t yet be available.</string>
+
+ <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+ <string name="encrypt_talkback_dialog_message_pattern">When you enter your pattern to start this device, accessibility services like Talkback won\'t yet be available.</string>
+
+ <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+ <string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like Talkback won\'t yet be available.</string>
+
</resources>