Merge "Move the CryptKeeper to Settings." into honeycomb

This commit is contained in:
Jason parks
2011-01-13 07:42:16 -08:00
committed by Android (Google) Code Review
8 changed files with 359 additions and 0 deletions

View File

@@ -22,5 +22,9 @@
<color name="memory_media_usage">#F33</color>
<color name="memory_apps_usage">#3F3</color>
<color name="memory_used">#FFF</color>
<color name="crypt_keeper_clock_background">#ff9a9a9a</color>
<color name="crypt_keeper_clock_foreground">#ff666666</color>
<color name="crypt_keeper_clock_am_pm">#ff9a9a9a</color>
</resources>

View File

@@ -3112,4 +3112,9 @@ found in the list of installed applications.</string>
<!-- Messaage shown in dialog when you can't manually sync -->
<string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync.</string>
<!-- This is displayed to the user when the device needs to be decrypted -->
<string name="enter_password">Enter password to decrypt storage</string>
<!-- This is displayed when the password is entered incorrectly -->
<string name="try_again">Sorry, try again</string>
</resources>