Commit Graph

1488 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
f750fc1b95 Import revised translations.
Change-Id: I318c3f9ffc38f6a751f31106924915dbfa5a7138
2011-05-17 17:04:53 -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
e3b5428611 Merge "Fixes in UsageBarPreference" 2011-05-13 11:17:45 -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
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
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
Eric Fischer
c34497571f Import revised translations.
Change-Id: I89ab066cb68227bf5879749ac47c942dcea7339d
2011-05-02 15:54:52 -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
Irfan Sheriff
7c2fa094cc Merge "Add summary details for add wifi network" 2011-04-18 13:44:36 -07:00
Jim Miller
74b1e0a733 Fix 4283049: Restore continue/cancel buttons in LockScreen Settings
This fixes a bug where the continue/cancel buttons were missing
from LockScreen settings in landscape mode.

The change also includes a minor change to enable using the IME enter
key to proceed to the next step.

Change-Id: I2dca0b40e38a128cc0aa637f573da01e779edb73
2011-04-15 18:52:31 -07:00
Irfan Sheriff
4dfce564ba Add summary details for add wifi network
Bug: 4266690
Change-Id: I3799fa79c0eab0037f207427f64fe2f95e023796
2011-04-15 17:02:04 -07:00
Eric Fischer
2c701570eb Import revised translations.
Change-Id: Ife515a41d11060032922c89eff125abcf0a99f87
2011-04-15 14:41:32 -07:00
Eric Fischer
89882974d6 Merge "Import revised translations." 2011-04-07 14:08:01 -07:00
Eric Fischer
c821f6d8f8 Import revised translations.
Change-Id: I176df34d590daa670ac132759d7f4cb91e4b3747
2011-04-07 13:59:28 -07:00
Joe Onorato
4c0c2bea9e advanced settings
Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be
2011-04-06 18:26:20 -07:00
Eric Fischer
8214c76e27 Import revised translations. DO NOT MERGE
Change-Id: I5096f0341965e767187b8444f93804cad934ada9
2011-04-06 13:51:27 -07:00
Jim Miller
30cf12cc17 Fix LockScreen Settings on phones.
Change-Id: Ibbb0bcb4f34ba442d9ec678277718d3141f9d807
2011-03-30 21:16:48 -07:00
Eric Fischer
3b4b91d43d Import revised translations. DO NOT MERGE
Change-Id: Ic677ab3652341f1ef35a068f7290e15145172f37
2011-03-29 12:00:36 -07:00
Amith Yamasani
1dd8c92ccc am ce0976cc: am 2ba97451: am f3b325f5: Debug feature for HDCP compliance testing.
* commit 'ce0976cccd8a283689b15e33ce2cfaf819620bf6':
  Debug feature for HDCP compliance testing.
2011-03-23 16:03:34 -07:00
Amith Yamasani
f3b325f54d Debug feature for HDCP compliance testing.
Bug: 4149811

Add a setting in Application->Development to change HDCP checking.

Change-Id: I5561b097b3fd7dbfc4eaf1977b80a37fc29572aa
2011-03-23 14:39:43 -07:00
Eric Fischer
36f7f4a773 Import revised translations. DO NOT MERGE
Change-Id: I889f8414c773a57bd38d30c0b60a51216ef00b1b
2011-03-22 13:39:43 -07:00
Eric Fischer
88806fa5ae Import revised translations.
Change-Id: I8146c6ff4e2c5d8cdcc9b82cf38d2baac89853f5
2011-03-17 16:55:36 -07:00
Eric Fischer
7f050e2ef8 Import revised translations. DO NOT MERGE
Change-Id: I6302e63ef939e3b0c14f1223121934ee0a5f1e14
2011-03-17 13:13:20 -07:00
Eric Fischer
24d6195266 Import revised translations. DO NOT MERGE
Change-Id: Ia5e71db67c6c9985d6b0c72c482cc45cd0563927
2011-03-16 17:01:59 -07:00
Eric Fischer
ef32822861 Import revised translations. DO NOT MERGE
Change-Id: I14c07d29f1cea3cedb6e9b0492d549e692c72612
2011-03-16 10:14:34 -07:00
Vasu Nori
78252114b4 am 4a1f3569: am 85d1f883: am b24dfbcc: Merge "bug:3514023 fix string formatting" into honeycomb-mr1
* commit '4a1f356928207333513595487240efe2be302c7e':
  bug:3514023 fix string formatting
2011-03-15 21:44:14 -07:00
Vasu Nori
85d1f88315 am b24dfbcc: Merge "bug:3514023 fix string formatting" into honeycomb-mr1
* commit 'b24dfbcc35842d5b6ed1f7d23348bada08ae0445':
  bug:3514023 fix string formatting
2011-03-15 21:37:37 -07:00
Gilles Debunne
e2255e2f18 Merge "Unused assets removed from Settings" 2011-03-15 16:24:36 -07:00
Eric Fischer
9a81c12275 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-15 14:58:35 -07:00
Eric Fischer
74a8594ee9 Import revised translations. DO NOT MERGE
Change-Id: I4889db13857a44d69b095e8004c407edad9e6756
2011-03-15 14:49:02 -07:00
Vasu Nori
b24dfbcc35 Merge "bug:3514023 fix string formatting" into honeycomb-mr1 2011-03-15 14:47:32 -07:00
Vasu Nori
75e17aa8cc bug:3514023 fix string formatting
Change-Id: I1d07e94f3693db09b29c621c5afae1cbaae24674
2011-03-15 14:44:50 -07:00
Gilles Debunne
c59a3a431c Unused assets removed from Settings
preview moved from drawable to drawable-mdpi

Change-Id: Id58d2cf38d52483057960b7ef176acf61e84dba3
2011-03-15 14:43:51 -07:00
Eric Fischer
d503062723 Import revised translations.
Change-Id: Id09b1bd5cf6247e40b156f0ce7cb850d17687009
2011-03-15 10:46:16 -07:00
Eric Fischer
7d3d72ba46 Import revised translations. DO NOT MERGE
Change-Id: Ifbdca414f22a58d1828780183518c0214f0ce0f6
2011-03-14 14:07:45 -07:00
Irfan Sheriff
f5fe437842 Merge "Fix numeric strings to not be translated" 2011-03-11 17:31:05 -08:00
Irfan Sheriff
6c7cd3bcba Fix numeric strings to not be translated
Bug: 4086518
Change-Id: Id6cc83cfcdaea6d9658dd6cc59f94ee6a34662d6
2011-03-11 15:42:09 -08:00
Daisuke Miyakawa
d4fa73f877 Stop using Switch.
Bug: 4082929
Change-Id: Idcf8f891e9e3257ed7b0a2727fe11fe540c8a141
2011-03-11 12:14:48 -08:00
Eric Fischer
91d0b30461 Import revised translations. DO NOT MERGE
Change-Id: I2f3eb8d6b9e3e8c06dbaaa372050b6688b9c0e2b
2011-03-10 14:26:33 -08:00
Eric Fischer
5ce140c135 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 11:40:28 -08:00
Eric Fischer
0198a30b6f Import revised translations. DO NOT MERGE
Change-Id: I3e2bd58983b329ea0e200f138a5d861e16ce6400
2011-03-10 11:27:50 -08:00
Jake Hamby
9fbaf432bd am 90222cf6: am f3448d1b: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1
* commit '90222cf6a8adbd5ae5be74c91a13a63f183a001e':
  Improve Bluetooth tethering UI usability.
2011-03-09 19:47:44 -08:00
Jake Hamby
c777ee29c8 Improve Bluetooth tethering UI usability.
- Updated hint text for BT tethering checkbox to
  "[Sharing|not sharing] this [tablet|phone]'s mobile data connection".
- Show correct hint text when user enters tethering screen.
- Show correct status after user enables tethering when Bluetooth is off.
  When BluetoothPan.setBluetoothTethering(true) is called with BT off,
  BluetoothPanProfileHandler will add a broadcast receiver to enable
  tethering after BT turns on. This happens too late to show the correct
  status when TetherSettings gets the adapter state changed event, so set
  a flag (mBluetoothEnableForTether) instead, and call setBluetoothTethering
  ourselves after the state changes to ON. Also, clear the flag if the
  adapter state changes to OFF or ERROR.
- Show correct status when user enables tethering, then disables Bluetooth,
  then returns to the tethering screen. Previously it would show
  Bluetooth tethering enabled, even though adapter state was OFF.
- Show the number of connected devices in tethering preference screen.
- Distinguish between PANU and NAP in device profiles screen, and show
  appropriate text to clarify the direction of tethering.
- Remove profiles from device profiles list when the device removes the UUID
  (e.g. Mac OS X turning NAP on/off) and after a NAP disconnection when the
  remote device only supports PANU.

Bug: 3414575
Change-Id: I2c0830876d5b9bddb293e57c4d3ca74f105911b8
2011-03-09 14:56:56 -08:00
Justin Ho
7002bf0f91 am 346c8a1f: am 6adc2ee8: Merge "Updated storage display colors in Settings" into honeycomb-mr1
* commit '346c8a1f0e86e805770f5d09f41ff9220192fdb3':
  Updated storage display colors in Settings
2011-03-08 18:40:20 -08:00
Amith Yamasani
cb6a9bc307 am cb84ad52: am 1ad4824d: am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".
* commit 'cb84ad529d802e60931d94b68912ee85c9758952':
  Wifi disconnect policy summary text should not contain "mobile data".
2011-03-08 18:39:59 -08:00