Commit Graph

3853 Commits

Author SHA1 Message Date
Jean Chalard
71ad1f4e3e Change the interface for user dictionary multiple locales.
The user dictionary interface now works the following way:
* Locale gathering
- The current locale is always considered as present, even if
there are no words for it in the user dictionary.
- Any locale for which at least one word is registered is
considered present.
- A null locale is considered a valid locale meaning "all
languages".
- If no words are present at all, since the current locale is
always considered present, the system will consider there is
exactly one locale present - and allow editing this user
dictionary.

* Options display
- If only one locale is present, the interface is the same as
for Honeycomb: display a "User dictionary" PreferenceScreen
that brings up the dictionary editor interface.
- If there are several locales present, then the user
dictionary option will jump to a screen that will display a
list of available locales.

* Word insertion
- Inserting a word will always use the locale of the currently
displayed dictionary. If it is the "all languages" null
pseudo-locale, that will still hold and the word will be added
to this pseudo-locale.

It is worthy to note that the "All languages" locale is only
accessible if for some reason there are already words with a
null locale in the database before this is installed. For
example, if an application has inserted some words that way,
or if the user inserted words with a previous version of the
settings application.
On a freshly flashed device, barring the use of third-party
application that would add such words, it is not possible to
access the "all languages" locale any more because there is
no interface to do it, though it works if such words are
inside.

Bug: 3479738
Change-Id: Iba323e5aeb3f4f575896903a4e8bef6ffb3ea306
2011-05-18 12:54:20 +09:00
Eric Fischer
309f385794 Merge "Import revised translations." 2011-05-17 17:17:33 -07:00
Eric Fischer
f750fc1b95 Import revised translations.
Change-Id: I318c3f9ffc38f6a751f31106924915dbfa5a7138
2011-05-17 17:04:53 -07:00
Brian Carlstrom
435e45e616 Move to KeyChain.bind
Change-Id: Ic12e84bdc2e391c4a08a0f854d0e0f7315fc31a3
2011-05-17 16:22:06 -07:00
Brian Carlstrom
2c1e9c7846 Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (5 of 6)" 2011-05-17 10:37:54 -07:00
Brian Carlstrom
9815429821 Make CertInstaller installed CA certs trusted by applications via default TrustManager (5 of 6)
frameworks/base

        Adding IKeyChainService APIs for CertInstaller and Settings use
    	keystore/java/android/security/IKeyChainService.aidl

    libcore

        Improve exceptions to include more information
    	luni/src/main/java/javax/security/auth/x500/X500Principal.java

        Move guts of RootKeyStoreSpi to TrustedCertificateStore, leaving only KeyStoreSpi methods.
        Added support for adding user CAs in a separate directory for system.
        Added support for removing system CAs by placing a copy in a sytem directory
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/RootKeyStoreSpi.java
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStore.java

        Formerly static methods on RootKeyStoreSpi are now instance methods on TrustedCertificateStore
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java

        Added test for NativeCrypto.X509_NAME_hash_old and X509_NAME_hash
        to make sure the implementing algorithms doe not change since
        TrustedCertificateStore depend on X509_NAME_hash_old (OpenSSL
        changed the algorithm from MD5 to SHA1 when moving from 0.9.8 to
        1.0.0)

    	luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

        Extensive test of new TrustedCertificateStore behavior
    	luni/src/test/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStoreTest.java

        TestKeyStore improvements
        - Refactored TestKeyStore to provide simpler createCA method (and
          internal createCertificate)
        - Cleaned up to remove use of BouncyCastle specific X509Principal
          in the TestKeyStore API when the public X500Principal would do.
        - Cleaned up TestKeyStore support methods to not throw Exception
          to remove need for static blocks for catch clauses in tests.

    	support/src/test/java/libcore/java/security/TestKeyStore.java
    	luni/src/test/java/libcore/java/security/KeyStoreTest.java
    	luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

        Added private PKIXParameters contructor for use by
        IndexedPKIXParameters to avoid wart of having to lookup and pass
        a TrustAnchor to satisfy the super-class sanity check.

    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
    	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java
    	luni/src/main/java/java/security/cert/PKIXParameters.java

    packages/apps/CertInstaller

        Change CertInstaller to call IKeyChainService.installCertificate
        for CA certs to pass them to the KeyChainServiceTest which will
        make them available to all apps through the
        TrustedCertificateStore. Change PKCS12 extraction to use AsyncTask.

    	src/com/android/certinstaller/CertInstaller.java

        Added installCaCertsToKeyChain and hasCaCerts accessor for use by
        CertInstaller. Use hasUserCertificate() internally. Cleanup coding
        style.

    	src/com/android/certinstaller/CredentialHelper.java

    packages/apps/KeyChain

        Added MANAGE_ACCOUNTS so that IKeyChainService.reset
        implementation can remove KeyChain accounts.

    	AndroidManifest.xml

        Implement new IKeyChainService methods:
        - Added IKeyChainService.installCaCertificate to install certs
          provided by CertInstaller using the TrustedCertificateStore.
        - Added IKeyChainService.reset to allow Settings to remove the
          KeyChain accounts so that any app granted access to keystore
          credentials are revoked when the keystore is reset.

    	src/com/android/keychain/KeyChainService.java

    packages/apps/Settings

        Changed com.android.credentials.RESET credential reset action to
        also call IKeyChainService.reset to remove any installed user CAs
        and remove KeyChain accounts to have AccountManager revoke
        credential granted to private keys removed during the RESET.

    	src/com/android/settings/CredentialStorage.java

        Added toast text value for failure case

    	res/values/strings.xml

    system/core

        Have init create world readable /data/misc/keychain to allow apps
        to access user added CA certificates installed by the CertInstaller.

    	rootdir/init.rc

Change-Id: Ie329aafe88f6ebe108d25382f587c933f3244e55
2011-05-16 18:03:58 -07:00
Gilles Debunne
6019c7dcba Merge "Refactoring in memory storage stats" 2011-05-16 11:14:26 -07:00
Gilles Debunne
5162a23b21 Refactoring in memory storage stats
Removed hard coded NUM_MEDIA_DIRS_TRACKED - 1 in loops and used actual
constants instead to make it less brittle if we add more categories.

Change-Id: I51ce9e7faca1ee55cf369eedf9422628b9501e13
2011-05-13 14:23:52 -07:00
satok
722ea03231 Fix NPE in InputMethodAndLanguageSettings
Bug: 4422368

Change-Id: I495eb8de9928922b18b37c6658bd8fd8b4ee3e1a
2011-05-14 04:56:12 +09:00
Gilles Debunne
e3b5428611 Merge "Fixes in UsageBarPreference" 2011-05-13 11:17:45 -07:00
Eric Fischer
495af730b6 am e7c82caf: (-s ours) am d779e5df: am 0bbe27da: am a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE
* commit 'e7c82caf2c062ff47581fd29aed4853371853569':
  Import revised translations.  DO NOT MERGE
2011-05-11 13:09:36 -07:00
Eric Fischer
4faf5d8018 am c258d997: (-s ours) am 450721fc: am 9766cccb: Import revised translations. DO NOT MERGE
* commit 'c258d9979f9dc574fde266ebf0aae4cfac5d2764':
  Import revised translations.  DO NOT MERGE
2011-05-11 13:08:27 -07:00
Jean Chalard
c087e35d7f Enable showing the user dictionary in several locales.
Bug: 3479738
Change-Id: Ic57a5675c44c36ad255f9927da151ad6a2a8c44c
2011-05-11 22:26:32 +09:00
Eric Fischer
8e8ae7100c Merge "Import revised translations." 2011-05-10 16:05:34 -07:00
Eric Fischer
f4ccb5727a Import revised translations.
Change-Id: Ide1889ee5b663aa0debc30af0249e4708ff7c746
2011-05-10 15:43:12 -07:00
Eric Fischer
e7c82caf2c am d779e5df: am 0bbe27da: am a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE
* commit 'd779e5dfbfc23a005b440f5931316d0742fdf3cc':
  Import revised translations.  DO NOT MERGE
2011-05-10 15:32:16 -07:00
Eric Fischer
d779e5dfbf am 0bbe27da: am a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE
* commit '0bbe27dabe8d667133a599dfffa8d7c6715ae7e6':
  Import revised translations.  DO NOT MERGE
2011-05-10 15:03:23 -07:00
Eric Fischer
0bbe27dabe am a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE
* commit 'a9aa8aa3341b164a54213a3b27fa0a1dd9ef9e70':
  Import revised translations.  DO NOT MERGE
2011-05-10 15:00:51 -07:00
Eric Fischer
c258d9979f am 450721fc: am 9766cccb: Import revised translations. DO NOT MERGE
* commit '450721fca317a7c111555ad6650f62b1081eb740':
  Import revised translations.  DO NOT MERGE
2011-05-10 12:23:31 -07:00
Eric Fischer
450721fca3 am 9766cccb: Import revised translations. DO NOT MERGE
* commit '9766cccb3969db4564ad4548582685ee7b18e2e6':
  Import revised translations.  DO NOT MERGE
2011-05-10 12:19:04 -07:00
Eric Fischer
9766cccb39 Import revised translations. DO NOT MERGE
Change-Id: Ieed2bec37375bf9dc2504922350c2d8ac3883f97
2011-05-09 17:04:32 -07:00
John Wang
aaac0448d3 am 71023531: am 22e52793: Update the MEID setting label.
* commit '710235316507a1ac5f0bd6a750dc60455bc21ca1':
  Update the MEID setting label.
2011-05-09 15:11:35 -07:00
John Wang
7102353165 am 22e52793: Update the MEID setting label.
* commit '22e5279382db1cbb05dd093a93ab7ddd9efbe2fe':
  Update the MEID setting label.
2011-05-09 15:08:24 -07:00
John Wang
22e5279382 Update the MEID setting label.
Currently show MEID for CDMA devices. For LTE devices, this should be IMEI.

Both values are the same for CDMA-LTE devices. Update "MEID" to "IMEI / MEID".

bug:4356748
Change-Id: I39b1f1c4c776a4acb045aa9ef7d8869ed66a30e4
2011-05-09 11:36:19 -07:00
Gilles Debunne
783be0a24f Fixes in UsageBarPreference
The widget layout that was used resulted in a clipped usage bar.
It also had a 6dip left offset inherited from the default layout
which adds margin after the text (even if the text is empty here).
Used a custom layout for the whole preference to fix this issue.

Other fixes in the drawing code to prevent accumulative rounding
issues.

Change-Id: Ief9bf85260345355615c9670624d86f0893eb2d2
2011-05-06 14:12:15 -07:00
Narayan Kamath
934d21dc2a Use the old TTS settings API for now.
Change-Id: I8ca3fcb0aee5572694e573f4ceaa0df261c807c3
2011-05-05 13:41:11 +01:00
Eric Fischer
ffdfd08ee8 Merge "Import revised translations." 2011-05-03 10:56:31 -07:00
Eric Fischer
c34497571f Import revised translations.
Change-Id: I89ab066cb68227bf5879749ac47c942dcea7339d
2011-05-02 15:54:52 -07:00
Robert Greenwalt
0edf6a79a4 am d65d1adb: am 3c3490c8: Use new RouteInfo class.
* commit 'd65d1adb5613107583f0cf208d7650c822f581e2':
  Use new RouteInfo class.
2011-05-02 13:32:15 -07:00
Robert Greenwalt
d65d1adb56 am 3c3490c8: Use new RouteInfo class.
* commit '3c3490c819a1a6ce72468c1d867429ac0f86def8':
  Use new RouteInfo class.
2011-05-02 13:29:26 -07:00
Robert Greenwalt
3c3490c819 Use new RouteInfo class.
Change-Id: I144ebb87e6d1809f59ebd32e64e186d836a365f8
2011-04-29 17:13:44 -07:00
Eric Fischer
a9aa8aa334 Import revised translations. DO NOT MERGE
Change-Id: Ia76f041ab40e27fb76f8f52f2e6e3b036421f910
2011-04-29 14:01:54 -07:00
Eric Fischer
8a00ad176f am a9b3463e: (-s ours) am 643e48b7: (-s ours) am 7c284c2c: Import revised translations. DO NOT MERGE
* commit 'a9b3463ea4e5e96ac69d7071ee574f1fc9cdfd13':
  Import revised translations.  DO NOT MERGE
2011-04-28 11:49:10 -07:00
Eric Fischer
a9b3463ea4 am 643e48b7: (-s ours) am 7c284c2c: Import revised translations. DO NOT MERGE
* commit '643e48b7fd1f1be62ac4bedc1051c00be129006b':
  Import revised translations.  DO NOT MERGE
2011-04-28 10:26:29 -07:00
Eric Fischer
643e48b7fd am 7c284c2c: Import revised translations. DO NOT MERGE
* commit '7c284c2c62ce565dacfae641108a2a5033e78721':
  Import revised translations.  DO NOT MERGE
2011-04-27 15:31:22 -07:00
Eric Fischer
7c284c2c62 Import revised translations. DO NOT MERGE
Change-Id: I56239c7b2a936acc9b93b8592a2a04e42a55458b
2011-04-27 13:53:57 -07:00
Conley Owens
faee432623 am fc5a1fe0: Ignoring empty list test in favor of commented out code.
* commit 'fc5a1fe0526706ccee48656df55e9f452c305ade':
  Avoid crash when switching to 2G/3G network.
2011-04-27 12:16:49 -07:00
Conley Owens
fc5a1fe052 Ignoring empty list test in favor of commented out code.
Change-Id: I478980eb6d56be164bbe22a73ff945ae9c57a57a
2011-04-27 10:33:00 -07:00
Conley Owens
47cd8a47f7 am bc20d67f: Merge "Avoid crash when switching to 2G/3G network."
* commit 'bc20d67fedd453eec9dcb127cf9df909a192baf5':
  Avoid crash when switching to 2G/3G network.
2011-04-27 09:55:23 -07:00
Conley Owens
bc20d67fed Merge "Avoid crash when switching to 2G/3G network." 2011-04-27 09:51:22 -07:00
Eric Fischer
a7b0037db8 Merge "Import revised translations." 2011-04-26 16:18:00 -07:00
Eric Fischer
1bd6ea9d72 Import revised translations.
Change-Id: I5cbe714a861e64d3198eac2b33fdeeece500e536
2011-04-26 16:08:29 -07:00
Jim Miller
5d9782a993 Merge "Fix 3402408: Manage "continue" button in ConfirmPassword screen" 2011-04-26 15:19:03 -07:00
Kenneth Westin
dd9131dcdf Avoid crash when switching to 2G/3G network.
Adding test that active APN array is not empty.

Change-Id: I16246aa45c991a9396ef03d9bb083d97c3ca2e1a
2011-04-26 14:08:45 +02:00
Eric Fischer
d9cf43b179 Import revised translations.
Change-Id: Id2b5cf8a5e88621dfb371526db231f9f3bf4d400
2011-04-22 12:19:05 -07:00
Wink Saville
af3eb5fcba am ac706b98: am 2c3ec092: Remove getCurrentDataConnectionList.
* commit 'ac706b987bad5b46c4f10be0284ae1ed4453261b':
  Remove getCurrentDataConnectionList.
2011-04-20 11:41:26 -07:00
Wink Saville
ac706b987b am 2c3ec092: Remove getCurrentDataConnectionList.
* commit '2c3ec09261bf1503e75328175b5286af5676845e':
  Remove getCurrentDataConnectionList.
2011-04-20 11:32:53 -07:00
Wink Saville
2c3ec09261 Remove getCurrentDataConnectionList.
I'll add another mechanism which will probably use an
asynchronous interface with the DataConnectionTracker.

Change-Id: I71f80bb9fe0496c42ff9b1ddbf4e36a68d3f1592
2011-04-20 10:24:36 -07:00
Dianne Hackborn
6c28e35b82 Fix crash if no external storage.
Change-Id: If5b0386b686d65cf9026a3c00459db371ab81b3a
2011-04-20 10:19:05 -07:00
Bjorn Bringert
df92f2e1e2 Fix TTS engine checkbox click handler
Before, the dialog asking whether to really enable
the engine wasn't shown. Also, the Default engine
list was not refreshed until you left the TTS settings
and came back.

Change-Id: I8cbded0fe9eedbfb05c294d831c91a857349b224
2011-04-19 14:37:49 +01:00