Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1e4d6e64: Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev automerge: e6ad7bf automerge: 966a1ca

Browse Source 
* commit '1e4d6e64a43a1eb5de893a71178c64d240d01f9f':
  Don't show a pattern-specific prompt at encryption time.
This commit is contained in:
Paul Crowley
2014-11-05 18:48:06 +00:00
committed by Android Git Automerger
parent 11fa427f6a 1e4d6e64a4
commit 40f17dbed9
5 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -2470,8 +2470,6 @@
<string name="master_clear_final_desc">Erase all your personal information and downloaded apps? You can\'t reverse this action!</string>
<!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
<string name="master_clear_final_button_text">Erase everything</string>
<!-- Message to draw an unlock pattern before clearing the device -->
<string name="master_clear_gesture_prompt">Draw your unlock pattern</string>
<!-- Explanation of drawing unlock pattern to reset phone -->
<string name="master_clear_gesture_explanation">You need to draw your unlock pattern to confirm a factory data reset.</string>
<!-- Master clear failed message -->
@@ -2508,8 +2506,6 @@
<string name="media_format_final_desc" product="default">Erase the SD card, deleting all files stored there? You can\'t reverse this action!</string>
<!-- SD card & phone storage settings screen, button on screen after user selects Format media button -->
<string name="media_format_final_button_text">Erase everything</string>
<!-- Message to draw an unlock pattern before clearing the device -->
<string name="media_format_gesture_prompt">Draw your unlock pattern</string>
<!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
<string name="media_format_gesture_explanation" product="nosdcard">You need to draw your unlock pattern to confirm that you want to erase the USB storage.</string>
<!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
@@ -4334,8 +4330,6 @@
<!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
<string name="credentials_settings_not_available">Credentials are not available for this user</string>
<!-- Message to draw an unlock pattern when installing credentials -->
<string name="credentials_install_gesture_prompt">Draw your unlock pattern</string>
<!-- Explanation of drawing unlock pattern to install credentials -->
<string name="credentials_install_gesture_explanation">You need to draw your unlock pattern to confirm credential installation.</string>