summaryrefslogtreecommitdiffstats
path: root/res/values-am
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-05-25 13:24:20 -0700
committerBrian Carlstrom <bdc@google.com>2011-06-01 10:47:42 -0700
commitd4023b7cca11e33e84df39dee9e9a737efab47c2 (patch)
treea204d6a63ffe26ad92c17438494b58b9c3118dfa /res/values-am
parenta862f2b14b94fe246a1f47919885d9a81ede9376 (diff)
downloadpackages_apps_settings-d4023b7cca11e33e84df39dee9e9a737efab47c2.zip
packages_apps_settings-d4023b7cca11e33e84df39dee9e9a737efab47c2.tar.gz
packages_apps_settings-d4023b7cca11e33e84df39dee9e9a737efab47c2.tar.bz2
Integrating keystore with keyguard (Part 4 of 4)
Summary: frameworks/base keystore rewrite keyguard integration with keystore on keyguard entry or keyguard change KeyStore API simplification packages/apps/Settings Removed com.android.credentials.SET_PASSWORD intent support Added keyguard requirement for keystore use packages/apps/CertInstaller Tracking KeyStore API changes Fix for NPE in CertInstaller when certificate lacks basic constraints packages/apps/KeyChain Tracking KeyStore API changes Details: frameworks/base Move keystore from C to C++ while rewriting password implementation. Removed global variables. Added many comments. cmds/keystore/Android.mk cmds/keystore/keystore.h cmds/keystore/keystore.c => cmds/keystore/keystore.cpp cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp Changed saveLockPattern and saveLockPassword to notify the keystore on changes so that the keystore master key can be reencrypted when the keyguard changes. core/java/com/android/internal/widget/LockPatternUtils.java Changed unlock screens to pass values for keystore unlock or initialization policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java KeyStore API changes - renamed test() to state(), which now return a State enum - made APIs with byte[] key arguments private - added new KeyStore.isEmpty used to determine if a keyguard is required keystore/java/android/security/KeyStore.java In addition to tracking KeyStore API changes, added new testIsEmpty and improved some existing tests to validate expect values. keystore/tests/src/android/security/KeyStoreTest.java packages/apps/Settings Removing com.android.credentials.SET_PASSWORD intent with the removal of the ability to set an explicit keystore password now that the keyguard value is used. Changed to ensure keyguard is enabled for keystore install or unlock. Cleaned up interwoven dialog handing into discrete dialog helper classes. AndroidManifest.xml src/com/android/settings/CredentialStorage.java Remove layout for entering new password res/layout/credentials_dialog.xml Remove enable credentials checkbox res/xml/security_settings_misc.xml src/com/android/settings/SecuritySettings.java Added ability to specify minimum quality key to ChooseLockGeneric Activity. Used by CredentialStorage, but could also be used by CryptKeeperSettings. Changed ChooseLockGeneric to understand minimum quality for keystore in addition to DPM and device encryption. src/com/android/settings/ChooseLockGeneric.java Changed to use getActivePasswordQuality from getKeyguardStoredPasswordQuality based on experience in CredentialStorage. Removed bogus class javadoc. src/com/android/settings/CryptKeeperSettings.java Tracking KeyStore API changes src/com/android/settings/vpn/VpnSettings.java src/com/android/settings/wifi/WifiSettings.java Removing now unused string resources res/values-af/strings.xml res/values-am/strings.xml res/values-ar/strings.xml res/values-bg/strings.xml res/values-ca/strings.xml res/values-cs/strings.xml res/values-da/strings.xml res/values-de/strings.xml res/values-el/strings.xml res/values-en-rGB/strings.xml res/values-es-rUS/strings.xml res/values-es/strings.xml res/values-fa/strings.xml res/values-fi/strings.xml res/values-fr/strings.xml res/values-hr/strings.xml res/values-hu/strings.xml res/values-in/strings.xml res/values-it/strings.xml res/values-iw/strings.xml res/values-ja/strings.xml res/values-ko/strings.xml res/values-lt/strings.xml res/values-lv/strings.xml res/values-ms/strings.xml res/values-nb/strings.xml res/values-nl/strings.xml res/values-pl/strings.xml res/values-pt-rPT/strings.xml res/values-pt/strings.xml res/values-rm/strings.xml res/values-ro/strings.xml res/values-ru/strings.xml res/values-sk/strings.xml res/values-sl/strings.xml res/values-sr/strings.xml res/values-sv/strings.xml res/values-sw/strings.xml res/values-th/strings.xml res/values-tl/strings.xml res/values-tr/strings.xml res/values-uk/strings.xml res/values-vi/strings.xml res/values-zh-rCN/strings.xml res/values-zh-rTW/strings.xml res/values-zu/strings.xml res/values/strings.xml packages/apps/CertInstaller Tracking KeyStore API changes src/com/android/certinstaller/CertInstaller.java Fix for NPE in CertInstaller when certificate lacks basic constraints src/com/android/certinstaller/CredentialHelper.java packages/apps/KeyChain Tracking KeyStore API changes src/com/android/keychain/KeyChainActivity.java src/com/android/keychain/KeyChainService.java support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java tests/src/com/android/keychain/tests/KeyChainServiceTest.java Change-Id: I80533bf8986a92b0b99cd5fb1c4943e0f23fc1c8
Diffstat (limited to 'res/values-am')
-rw-r--r--res/values-am/strings.xml7
1 files changed, 0 insertions, 7 deletions
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c9e673c..8fc902c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1873,8 +1873,6 @@
<string name="vpn_secret_not_set" msgid="1037792636371641845">"(አልተዘጋጀም)"</string>
<!-- no translation found for credentials_title (4446234003860769883) -->
<skip />
- <string name="credentials_access" msgid="4843187230913860492">"ጥብቅመረጃዎች ተጠቀም"</string>
- <string name="credentials_access_summary" msgid="319662078718574168">"ትግበራዎች ጥብቅ ምስክሮች እና ሌላ መረጃዎች ለመድረስ ፍቀድ።"</string>
<!-- no translation found for credentials_install (466093273825150847) -->
<skip />
<!-- no translation found for credentials_install (953914549998062317) -->
@@ -1883,8 +1881,6 @@
<skip />
<!-- no translation found for credentials_install_summary (5737658257407822713) -->
<skip />
- <string name="credentials_set_password" msgid="9104473585811899989">"የይለፍ ቃል አዘጋጅ"</string>
- <!-- outdated translation 8287876917562085701 --> <string name="credentials_set_password_summary" msgid="6756719720826053228">"አዘጋጅ ወይም የመረጃ ማከማቻ ይለፍ ቃል ለውጥ"</string>
<!-- outdated translation 9170150870552453457 --> <string name="credentials_reset" msgid="3239382277144980418">"ማከማቻ አጥራ"</string>
<!-- outdated translation 1530388094693731636 --> <string name="credentials_reset_summary" msgid="3810369467217453606">"የሁሉም ይዘቶች የመረጃ ማከማቻአጥራ እና የይለፍ ቃሉን ዳግም አስጀመር።"</string>
<string name="credentials_unlock" msgid="1463040326264133844">"የይለፍ ቃል አስገባ"</string>
@@ -1892,10 +1888,7 @@
<!-- no translation found for credentials_password_hint (4915128717409363024) -->
<skip />
<string name="credentials_old_password" msgid="7553393815538684028">"የአሁኑ ይለፍ ቃል፡"</string>
- <string name="credentials_new_password" msgid="267487774686796938">"አዲስ ይለፍ ቃል፡"</string>
- <string name="credentials_confirm_password" msgid="4732250000633424345">"አዲስ ይለፍቃል አረጋግጥ፡"</string>
<!-- outdated translation 819990295796804516 --> <string name="credentials_reset_hint" msgid="2336340927894094814">"ሁሉም መረጃ ለመሰረዝ መፈለግዎን እና የመረጃ ማከማቻ ይለፍቃሉን ዳግም ለማስጀመር እርግጠኛ ነዎት?"</string>
- <string name="credentials_passwords_mismatch" msgid="5288565139590031733">" የይለፍ ቃሎችህ አልተዛመዱም."</string>
<string name="credentials_password_too_short" msgid="7502749986405522663">"የይለፍ ቃሉ ቢያንስ 8 ቁምፊዎች አሉት።"</string>
<!-- outdated translation 7525192410790152041 --> <string name="credentials_wrong_password" msgid="2541932597104054807">"እባክዎ ትክክለኛውን ይለፍቃል ያስገቡ።"</string>
<!-- outdated translation 6392481296673345268 --> <string name="credentials_reset_warning" msgid="5320653011511797600">"እባክዎ ትክከለኛውን የይለፍ ቃል ያስገቡ። የመረጃ ማከማቻው ከመጥፋቱ በፊት ትክክለኛውን የይለፍ ቃል ለማስገባት አንድ ተጨማሪ ሙከራ አለዎ።"</string>