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

am 741bad53: am e68f5224: Show correct string when prompting for pattern before encrypting

Browse Source 
* commit '741bad53a060700b639f4a061e0f63702224bb39':
  Show correct string when prompting for pattern before encrypting
This commit is contained in:
Paul Lawrence
2014-07-24 23:31:06 +00:00
committed by Android Git Automerger
parent 6b68dba3b0 741bad53a0
commit 40b8f46072
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -831,6 +831,12 @@
<string name="crypt_keeper_dialog_need_password_message">You need to set a lock screen PIN or <string name="crypt_keeper_dialog_need_password_message">You need to set a lock screen PIN or
password before you can start encryption.</string> 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 --> <!-- Title of the final confirmation screen before starting device encryption -->
<string name="crypt_keeper_confirm_title">Encrypt?</string> <string name="crypt_keeper_confirm_title">Encrypt?</string>
<!-- Warning text in the final confirmation screen before starting device encryption --> <!-- Warning text in the final confirmation screen before starting device encryption -->

2
src/com/android/settings/CryptKeeperSettings.java
View File

@@ -164,7 +164,7 @@ public class CryptKeeperSettings extends Fragment {
return helper.launchConfirmationActivity(request, return helper.launchConfirmationActivity(request,
res.getText(R.string.master_clear_gesture_prompt), 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); true);
} }