Merge "Update string for message of DirectBootWarnDialog" am: b0cc3a6c7d

am: 662e59e628

Change-Id: I58f28cc3473c72c2061cc4c90cc6a2d50812e670
This commit is contained in:
tiansiming [田思明]
2018-09-04 13:05:10 -07:00
committed by android-build-merger

View File

@@ -8208,7 +8208,7 @@
<string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\u2019t yet be available.</string> <string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\u2019t yet be available.</string>
<!-- [CHAR LIMIT=NONE] Dialog body explaining that the app just selected by the user will not work after a reboot until until after the user enters their credentials, such as a PIN or password. --> <!-- [CHAR LIMIT=NONE] Dialog body explaining that the app just selected by the user will not work after a reboot until until after the user enters their credentials, such as a PIN or password. -->
<string name="direct_boot_unaware_dialog_message">Note: After a reboot, this app can\'t start until you unlock your phone</string> <string name="direct_boot_unaware_dialog_message">Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone</string>
<!-- Title and summary for SIM Status --> <!-- Title and summary for SIM Status -->
<string name="imei_information_title">IMEI information</string> <string name="imei_information_title">IMEI information</string>