Commit Graph

4524 Commits

Author SHA1 Message Date
Amith Yamasani
0fbaacaa9b am 138a695f: am cfd524f0: Visual adjustments for smaller tablets.
* commit '138a695f179aa16bff033b873f502161b1be66e0':
  Visual adjustments for smaller tablets.
2011-05-25 11:05:56 -07:00
Amith Yamasani
138a695f17 am cfd524f0: Visual adjustments for smaller tablets.
* commit 'cfd524f07af0820e2e41fd74e7e3c5b7433854f8':
  Visual adjustments for smaller tablets.
2011-05-25 11:01:57 -07:00
Jim Miller
66d6968085 am e3e9561b: am 7505d460: am d12b9509: Fix 4462497: Make lockscreen preference screen layouts more dynamic
* commit 'e3e9561bbdde3ffbeece9ab3433700db7e5f27e4':
  Fix 4462497: Make lockscreen preference screen layouts more dynamic
2011-05-25 09:57:57 -07:00
Amith Yamasani
cfd524f07a Visual adjustments for smaller tablets.
Make the Manage Apps tab indicators horizontally scrollable.
Use medium font size for user dictionary.

Bug: 4462313

Change-Id: Iba44e758715c0187ea17ed072794b8596dee0e54
2011-05-24 15:49:34 -07:00
Jim Miller
e3e9561bbd am 7505d460: am d12b9509: Fix 4462497: Make lockscreen preference screen layouts more dynamic
* commit '7505d4607a95e050f4f037ef35982a16dd710e3e':
  Fix 4462497: Make lockscreen preference screen layouts more dynamic
2011-05-24 13:14:54 -07:00
Jim Miller
7505d4607a am d12b9509: Fix 4462497: Make lockscreen preference screen layouts more dynamic
* commit 'd12b95093770f1a71f60f67be9a5e28277b634a1':
  Fix 4462497: Make lockscreen preference screen layouts more dynamic
2011-05-24 13:10:15 -07:00
Irfan Sheriff
af7686819b am b7c2d5b4: am 7c210ba5: Fix invalid linkspeed display
* commit 'b7c2d5b4e1bafe543d3887d350b3e77d71a0cf34':
  Fix invalid linkspeed display
2011-05-24 12:56:26 -07:00
Irfan Sheriff
c82ba4a385 am 87661736: am 5ee2fb92: Merge "Fix submit button display for WPS" into honeycomb-LTE
* commit '8766173651668a18b3cf8ea2ce545d5178eddb6c':
  Fix submit button display for WPS
2011-05-24 12:56:23 -07:00
Jim Miller
b01162c2dc am 9e8b6ba5: am 318f7850: am 360f0603: Fix 4462497: Use new sw600dp resource target for LockScreen settings
* commit '9e8b6ba54eec4a3c43fd25f8f5d217c54525c4cc':
  Fix 4462497: Use new sw600dp resource target for LockScreen settings
2011-05-23 20:48:28 -07:00
Jim Miller
b5b27eb632 am 6ba50de7: am d36628a7: am e8ebec86: Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.
* commit '6ba50de7ac94accbd20428bb3d184e4a24e1fce6':
  Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.
2011-05-23 20:48:25 -07:00
Jim Miller
d12b950937 Fix 4462497: Make lockscreen preference screen layouts more dynamic
This reduces the dependency of LockScreen preference screens
on a particular device size by using centering logic instead of
absolute offsets/sizes.

Change-Id: I6ff9e71dc122e12493148437dda647820ae0f308
2011-05-23 17:15:36 -07:00
Irfan Sheriff
b7c2d5b4e1 am 7c210ba5: Fix invalid linkspeed display
* commit '7c210ba5c18c2720023dd8fc4215cde95a6fe71c':
  Fix invalid linkspeed display
2011-05-23 16:51:38 -07:00
Irfan Sheriff
8766173651 am 5ee2fb92: Merge "Fix submit button display for WPS" into honeycomb-LTE
* commit '5ee2fb92a9e05dda877a497847c7543daaf5ea69':
  Fix submit button display for WPS
2011-05-23 16:48:56 -07:00
Irfan Sheriff
7c210ba5c1 Fix invalid linkspeed display
Bug: 4391449
Change-Id: I8c8efcaa73d09c1e8b523f7798b6c626edc96c1e
2011-05-23 16:47:02 -07:00
Irfan Sheriff
5ee2fb92a9 Merge "Fix submit button display for WPS" into honeycomb-LTE 2011-05-23 16:46:22 -07:00
Jim Miller
9e8b6ba54e am 318f7850: am 360f0603: Fix 4462497: Use new sw600dp resource target for LockScreen settings
* commit '318f7850f6651d5d62df1d5dce05d67dfa5d9188':
  Fix 4462497: Use new sw600dp resource target for LockScreen settings
2011-05-20 16:54:35 -07:00
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
Irfan Sheriff
21e644a9a8 Fix submit button display for WPS
Change Icd3fde90 exposed an existing issue where password validity was
being checked for WPS as well. Fix it.

Bug: 4391449
Change-Id: I60ca8869eee680f5ec71284a1ac6ba956a992312
2011-05-20 16:50:23 -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
The Android Open Source Project
1396d5bd3f Reconcile with gingerbread-release honeycomb-release
Change-Id: I9420067355edd5edf92f62fd0024760e14e4fca5
2011-05-20 14:06:22 -07:00
Jim Miller
6ba50de7ac am d36628a7: am e8ebec86: Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.
* commit 'd36628a74e699625e874608a7cb77cffaf0e9b29':
  Fix 4462497: Fixes crash in settings due to using wrong layout on 7" devices.
2011-05-20 13:26:49 -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
Irfan Sheriff
3493c20433 am ba46f269: am a6f178a8: Merge "Fix enabling of submit button" into honeycomb-LTE
* commit 'ba46f269abf8cbafaf68902a23935a1779aa316d':
  Fix enabling of submit button
2011-05-19 17:18:12 -07:00
Irfan Sheriff
ba46f269ab am a6f178a8: Merge "Fix enabling of submit button" into honeycomb-LTE
* commit 'a6f178a817ec36d5cf6d6a3d9c19c73278f0c3ca':
  Fix enabling of submit button
2011-05-19 17:15:43 -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
Irfan Sheriff
a6f178a817 Merge "Fix enabling of submit button" into honeycomb-LTE 2011-05-19 16:47:04 -07:00
Irfan Sheriff
990c3ad530 Fix enabling of submit button
Change I478c915b introduced a regression where the submit
button is enabled even if no password is entered for a secure
network.

This happened because our checks would override a password
check when IP and proxy settings are valid (which is the default
setting)

Bug: 4462439
Change-Id: Icd3fde90759f33fa391ec79ae8075b6d8388d2e9
2011-05-19 16:06:31 -07:00
Eric Fischer
5179666491 am be94e211: (-s ours) am d6e23b9a: am ce116503: Import revised translations. DO NOT MERGE
* commit 'be94e211d178dbfe539043e053f79a9d9eb61011':
  Import revised translations.  DO NOT MERGE
2011-05-18 09:21:43 -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
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
Eric Fischer
be94e211d1 am d6e23b9a: am ce116503: Import revised translations. DO NOT MERGE
* commit 'd6e23b9a5ca2f58a7082f7cca9f5eca982403531':
  Import revised translations.  DO NOT MERGE
2011-05-17 13:33: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
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
The Android Automerger
859683148b merge in gingerbread-release history after reset to gingerbread 2011-05-13 14:27:44 -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