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

am 0fc78608: am 81d7a806: Do not reuse master_clear_gesture_* strings for credential installation confirmation

Browse Source 
* commit '0fc786085f8fe5be769300c857d86038f9f571ee':
  Do not reuse master_clear_gesture_* strings for credential installation confirmation
This commit is contained in:
Brian Carlstrom
2012-05-01 12:07:21 -07:00
committed by Android Git Automerger
parent 60df5835f6 0fc786085f
commit f058ae28d8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -2036,7 +2036,7 @@
<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 unlockp attern to reset phone -->
<!-- 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 -->
<string name="master_clear_failed">No reset was performed because the System Clear service isn\'t available.</string>
@@ -3236,6 +3236,11 @@
<!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
<string name="trusted_credentials_summary">Display trusted CA certificates</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>
<!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
<string name="credentials_unlock"></string>
<!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->

4
src/com/android/settings/CredentialStorage.java
View File

@@ -338,8 +338,8 @@ public final class CredentialStorage extends Activity {
Resources res = getResources();
boolean launched = new ChooseLockSettingsHelper(this)
.launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST,
res.getText(R.string.master_clear_gesture_prompt),
res.getText(R.string.master_clear_gesture_explanation));
res.getText(R.string.credentials_install_gesture_prompt),
res.getText(R.string.credentials_install_gesture_explanation));
return launched;
}