Commit Graph

135 Commits

Author SHA1 Message Date
Eric Fischer
a1307695c1 Import revised translations.
Change-Id: Ib916cb8bb0b6f45452300b50b5ac138f89a89c29
2011-06-20 14:54:12 -07:00
Eric Fischer
087db10687 Import revised translations.
Change-Id: I18b4dda593468e8af5823db665ee1fb1aac6a812
2011-06-06 16:08:40 -07:00
Eric Fischer
22d6d479fd Import revised translations.
Change-Id: I5a80f7e38686bd3ac3cbaa41e2eec06f31c065cf
2011-06-02 16:58:43 -07:00
Brian Carlstrom
d4023b7cca 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
2011-06-01 10:47:42 -07:00
Eric Fischer
77f9a9beef Import revised translations.
Change-Id: Ied705b2da99164f4257d2a6b7b4ce95d7bfb0052
2011-05-26 15:47:05 -07:00
Eric Fischer
f750fc1b95 Import revised translations.
Change-Id: I318c3f9ffc38f6a751f31106924915dbfa5a7138
2011-05-17 17:04:53 -07:00
Eric Fischer
1bd6ea9d72 Import revised translations.
Change-Id: I5cbe714a861e64d3198eac2b33fdeeece500e536
2011-04-26 16:08:29 -07:00
Eric Fischer
d9cf43b179 Import revised translations.
Change-Id: Id2b5cf8a5e88621dfb371526db231f9f3bf4d400
2011-04-22 12:19:05 -07:00
Eric Fischer
2c701570eb Import revised translations.
Change-Id: Ife515a41d11060032922c89eff125abcf0a99f87
2011-04-15 14:41:32 -07:00
Eric Fischer
c821f6d8f8 Import revised translations.
Change-Id: I176df34d590daa670ac132759d7f4cb91e4b3747
2011-04-07 13:59:28 -07:00
Eric Fischer
88806fa5ae Import revised translations.
Change-Id: I8146c6ff4e2c5d8cdcc9b82cf38d2baac89853f5
2011-03-17 16:55:36 -07:00
Eric Fischer
d503062723 Import revised translations.
Change-Id: Id09b1bd5cf6247e40b156f0ce7cb850d17687009
2011-03-15 10:46:16 -07:00
Eric Fischer
d4f03409ae Import revised translations.
Change-Id: I831ca5658dfa0bb442aed60cfe0ac1ef173f70f7
2011-03-01 11:02:57 -08:00
Eric Fischer
73c49db922 Import revised translations.
Change-Id: I82a7d70f3d77f27fb223f1ae178a668d77e01a38
2011-02-25 11:37:53 -08:00
Eric Fischer
d23c221afe Import revised translations.
Change-Id: If127a3dcc17eb1ddebf5ef4cb08bb3b1dcfdc418
2011-02-24 11:58:22 -08:00
Eric Fischer
82d880de75 Import revised translations.
Change-Id: I51cf9d94cd14e67e56a86e669a92e1a64eb6540b
2011-02-17 10:20:39 -08:00
Eric Fischer
45d893c523 Import revised translations.
Change-Id: I989beece90deec6abb2542697d06caf88ae2f4a9
2011-01-12 17:05:49 -08:00
Eric Fischer
332af2fdf5 Import revised translations.
Change-Id: Ia9338cf200345ea00eb0179ca06770a9c47c16d8
2010-12-23 14:18:00 -08:00
Eric Fischer
7ea34ac8c8 Import revised translations.
Change-Id: Ic03653ba9e447830ec3d4b3ae5d9c7b4472d6170
2010-12-14 13:59:18 -08:00
Eric Fischer
ada96a72af Import revised translations.
Change-Id: I58f1a7d3da4c09ad3e00a94bc5353393b99f7d6d
2010-12-09 16:08:56 -08:00
Eric Fischer
dd9f69a25c Import revised translations.
Change-Id: Ifa67354329fd9a3c44ae870fc063df8048c2f7c8
2010-12-01 15:18:42 -08:00
Eric Fischer
5931c0d667 Import revised translations.
Change-Id: Ib13eef88a2489cc34caaa727680334f18489a3dc
2010-11-29 15:17:31 -08:00
Eric Fischer
3b046f5759 Import revised translations.
Change-Id: I2f6d6220057db8eb6fb8126ebec9e209d4eade36
2010-11-17 11:41:10 -08:00
Eric Fischer
9dfa60c33e Import revised translations.
Change-Id: I8ff3fdad70919d2937c3a897b5698e45078d0227
2010-11-09 17:42:54 -08:00
Eric Fischer
9446b7fe50 Import revised translations.
Change-Id: I0d19c79e3e0ac76527671d181bb77e8944ec4a5f
2010-10-27 14:36:03 -07:00
Ken Wakasa
6d5b8951b1 Merge commit '47ad0cf3' into manualmerge
Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
2010-09-30 11:54:31 +09:00
Ken Wakasa
d2c3f37fa4 Revise the Language & keyboard settings layout.
bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
2010-09-29 23:52:02 +09:00
Eric Fischer
5dc3028f28 Import revised translations.
Change-Id: Iaf1681fd1e93df389d6028cf41d6f830f509b7ce
2010-09-24 12:28:13 -07:00
Eric Fischer
b2fa8719a4 Import revised translations. DO NOT MERGE
Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b
2010-09-24 10:26:20 -07:00
Eric Fischer
4a8608af64 Import revised translations.
Change-Id: I518b97a1bb56438dddf7ea42b836d298f65b1c87
2010-09-10 15:46:25 -07:00
Eric Fischer
be45f642ca Import revised translations. DO NOT MERGE
Change-Id: I3a1f1eeb653d982ddc30c765a4a530aa48a364bf
2010-09-10 13:07:48 -07:00
Eric Fischer
8f32a38393 Preserve old translations for changed strings. DO NOT MERGE
Change-Id: I7ce80a0d57a6ff09dd12abab5ba6df9019d740ca
2010-09-03 17:42:59 -07:00
Eric Fischer
ce4e0ede2a Import revised translations
Change-Id: I5ff43233cd7017d36238fe17384585cb3938e081
2010-08-30 13:40:26 -07:00
Eric Fischer
92669a512a Import revised translations. DO NOT MERGE
Change-Id: I258c6a8b900eae6e101ad910b9414e5ba857246d
2010-08-27 17:17:47 -07:00
Eric Fischer
4216902ba3 Import revised translations.
Change-Id: I22bb0d58dabccd19a4726c5abf97710f1970c211
2010-08-17 16:56:21 -07:00
Eric Fischer
f8a91b535b Import revised translations. DO NOT MERGE
Change-Id: If954fbc7c9ff4898e76e6e4dcde4f9dffdd7cbf2
2010-08-17 16:45:27 -07:00
Eric Fischer
f10101c9c6 Import revised translations.
Change-Id: I0b805e4c7d2cedf70ec4ca5309f2a8073010fa51
2010-08-05 16:09:45 -07:00
Eric Fischer
4d9d75a424 Import revised translations. DO NOT MERGE
Change-Id: Ic83849d97650cec0560d847a962756c53d65ea78
2010-08-04 10:45:20 -07:00
Irfan Sheriff
ca61c25578 am a4966840: am de3e5665: Add phase2 authentication settings
Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken

* commit 'a496684019497395b71c6d460501197a74e21e0e':
  Add phase2 authentication settings
2010-06-03 11:14:40 -07:00
Irfan Sheriff
de3e56650d Add phase2 authentication settings
Bug: 2734813
Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
2010-06-02 16:31:20 -07:00
Kenny Root
28b245c01d Import revised translations
Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
2010-05-17 11:42:19 -07:00
Kenny Root
6d40987098 Import revised translations
Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
2010-04-29 16:01:54 -07:00
Kenny Root
19b4bdca55 am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyo
Merge commit '9fef437e04edd18f6406a49095403a1b71becf58' into kraken

* commit '9fef437e04edd18f6406a49095403a1b71becf58':
  Import revised translations
2010-04-28 09:47:07 -07:00
Kenny Root
eab62faea7 Import revised translations
Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
2010-04-28 09:20:52 -07:00
Kenny Root
9789ca7df0 am ee381422: Merge "Import revised translations" into froyo
Merge commit 'ee3814226706eb0600928c573254997c4ac148b9' into kraken

* commit 'ee3814226706eb0600928c573254997c4ac148b9':
  Import revised translations
2010-04-15 06:43:16 -07:00
Kenny Root
398213ec34 Import revised translations
Change-Id: Ia29e5c15fbd147579185c31d03844ccc5a11032e
2010-04-14 20:34:50 -07:00
Kenny Root
6e117870e8 am af05891d: Import revised translations
Merge commit 'af05891d31bf86e12910602be305a61fdcf1ace7' into kraken

* commit 'af05891d31bf86e12910602be305a61fdcf1ace7':
  Import revised translations
2010-04-03 14:13:50 -07:00
Kenny Root
af05891d31 Import revised translations
Change-Id: I7ce7aa7745bfb57870f1239dba8bd0bd714590dd
2010-04-03 14:02:57 -07:00
Kenny Root
bb2ddbba63 am c0b5624c: Import revised translations
Merge commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b' into kraken

* commit 'c0b5624ccc3b88b6b22fb39da30eed227b87785b':
  Import revised translations
2010-03-30 09:46:20 -07:00
Kenny Root
c0b5624ccc Import revised translations
Change-Id: Ib730899be1485cc95ed6254279bae0c9413332b3
2010-03-30 09:33:49 -07:00