Commit Graph

2428 Commits

Author SHA1 Message Date
Jim Miller
318f7850f6 am 360f0603: Fix 4462497: Use new sw600dp resource target for LockScreen settings
* commit '360f060334d3be3dbf13f3af770eb4fcccfddfb2':
  Fix 4462497: Use new sw600dp resource target for LockScreen settings
2011-05-20 16:51:46 -07:00
Jim Miller
360f060334 Fix 4462497: Use new sw600dp resource target for LockScreen settings
Change-Id: I3156aedff564dbf426fa0421a66c7f491af6a354
2011-05-20 15:50:42 -07:00
Jim Miller
d36628a74e am e8ebec86: Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.
* commit 'e8ebec86e6ce342b929c96c001b1599d7d84effc':
  Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.
2011-05-20 13:16:38 -07:00
Jim Miller
e8ebec86e6 Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.
Change-Id: I674112df2bdcec0bd94c85b1a777c336c037edc5
2011-05-19 17:09:10 -07:00
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
Eric Fischer
d6e23b9a5c am ce116503: Import revised translations. DO NOT MERGE
* commit 'ce116503a7ca08302711fc77f6b21f2fbbe3e76e':
  Import revised translations.  DO NOT MERGE
2011-05-17 13:29:57 -07:00
Eric Fischer
ce116503a7 Import revised translations. DO NOT MERGE
Change-Id: Iafedceb5fee433d9a55f8f76e941778c2ace85e7
2011-05-17 13:21:44 -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
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
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
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
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
Simon Wilson
f927cccd79 am 37063d6a: DO NOT MERGE Clarify additional system update string length/usage
* commit '37063d6adf9b472a8bb4bd58493517e04aafba95':
  DO NOT MERGE Clarify additional system update string length/usage
2011-04-11 14:12:43 -07:00
Simon Wilson
37063d6adf DO NOT MERGE Clarify additional system update string length/usage
Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49
2011-04-11 12:38:54 -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
Eric Fischer
84c9005375 am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
  Reimport Settings translations.  DO NOT MERGE
2011-04-04 14:43:04 -07:00
Simon Wilson
2ca7add59f am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
  DO NOT MERGE Put additional update package names in config.xml
2011-04-04 14:43:02 -07:00
Eric Fischer
6735ae141f am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
* commit 'b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
  Revert "Import revised translations.  DO NOT MERGE"
2011-04-04 14:42:59 -07:00
Eric Fischer
dfb7882776 am 955ab98f: Import revised translations. DO NOT MERGE
* commit '955ab98f030cd198d838bdff8768ff87a17be9a8':
  Import revised translations.  DO NOT MERGE
2011-04-04 12:21:25 -07:00
Eric Fischer
fcb089c942 Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread 2011-04-01 16:52:28 -07:00
Simon Wilson
ca572fb64b Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread 2011-04-01 16:47:22 -07:00
Eric Fischer
3ac5c8cfd2 Reimport Settings translations. DO NOT MERGE
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
2011-04-01 16:42:38 -07:00
Eric Fischer
b4bd78f523 Revert "Import revised translations. DO NOT MERGE"
This reverts commit 955ab98f03.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
2011-04-01 16:13:11 -07:00
Simon Wilson
5014f281d7 DO NOT MERGE Put additional update package names in config.xml
Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
2011-04-01 13:59:32 -07:00
Jim Miller
30cf12cc17 Fix LockScreen Settings on phones.
Change-Id: Ibbb0bcb4f34ba442d9ec678277718d3141f9d807
2011-03-30 21:16:48 -07:00
Park Sanghyun
2b2959b321 am e5da8565: DO NOT MERGE Add support for additional System Update menu item
* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
  DO NOT MERGE Add support for additional System Update menu item
2011-03-30 09:31:15 -07:00
Eric Fischer
3b4b91d43d Import revised translations. DO NOT MERGE
Change-Id: Ic677ab3652341f1ef35a068f7290e15145172f37
2011-03-29 12:00:36 -07:00
Eric Fischer
955ab98f03 Import revised translations. DO NOT MERGE
Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4
2011-03-29 10:58:24 -07:00
Park Sanghyun
e5da8565ca DO NOT MERGE Add support for additional System Update menu item
Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915
2011-03-25 19:18:01 -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