Commit Graph

2352 Commits

Author SHA1 Message Date
Freeman Ng
6356b17a53 am d671182d: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2
* commit 'd671182d88a193bee25d82a1941a57a84ed0fdc4':
  make setup wizard's wifi and datetime settings look good for 7"
2011-05-26 10:02:20 -07:00
Daniel Sandler
2943cfa606 Dream (screensaver) settings.
Depends on change Ied691856 for
Settings.Secure.DREAM_TIMEOUT and
Settings.Secure.DREAM_COMPONENT.

Change-Id: Ib6f74b74036e12637efb891b97e459a4e33444e7
2011-05-26 11:32:06 -04:00
Dianne Hackborn
aef746c45f Implement new manage apps UI for compat mode.
Change-Id: Ia8db7f534b7294fbbb34e0acdedab3a96cea59e9
2011-05-26 01:06:11 -07:00
Amith Yamasani
ba61aaaaa3 am 0fbaacaa: am 138a695f: am cfd524f0: Visual adjustments for smaller tablets.
* commit '0fbaacaa9b29401a4191ca85dccfe68660928a11':
  Visual adjustments for smaller tablets.
2011-05-25 21:28:22 -07:00
Freeman Ng
d671182d88 Merge "make setup wizard's wifi and datetime settings look good for 7"" into honeycomb-mr2 2011-05-25 21:13:03 -07:00
Freeman Ng
edb03bf537 make setup wizard's wifi and datetime settings look good for 7"
Note: this entailed locking datetime settings not into portrait
like everything else in the setup process, but landscape, because
the existing xlarge layout wasn't rearranging itself into a portrait
alignment very well. I can give it another try later if I can have
some help from UE.

Change-Id: Ia8ce8e8292ed768bd117beedf3d94a287e658f4b
2011-05-25 19:06:21 -07:00
Adam Powell
57218b5afb am 3c110e50: Fix account type selector for adding accounts to match holo layout guidelines.
* commit '3c110e500dad9dc21ae7efa13a73f1876aa38cee':
  Fix account type selector for adding accounts to match holo layout guidelines.
2011-05-25 17:58:34 -07:00
Adam Powell
3c110e500d Fix account type selector for adding accounts to match holo layout
guidelines.

Change-Id: I0cb2f2655e878de65b25c46e2b852bad6e1a99ad
2011-05-25 17:46:30 -07:00
Jim Miller
fbc72cd601 am fd8f7f12: Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
* commit 'fd8f7f120dd04acaa7ac81680dcc058d4a1d20d4':
  Fix 4462497: Make ownerinfo preference layout more dynamic
2011-05-25 16:27:52 -07:00
Jim Miller
fd8f7f120d Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2 2011-05-25 16:06:17 -07:00
Amith Yamasani
6246d459a1 am e9f5a297: Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2
* commit 'e9f5a2975b827ad61ab54747b196aed37230bbbe':
  Fix blank Battery Use screen due to changes in framework.
2011-05-25 14:56:08 -07:00
Jim Miller
b633cea58b Fix 4462497: Make ownerinfo preference layout more dynamic
This fixes a bug where the EditText of OwnerInfo was partially
off-screen in portrait mode on 7" devices.

Change-Id: I8ba985ac6ce88bb42209a8a7f8acc5b4476fe8f2
2011-05-25 14:56:00 -07:00
Amith Yamasani
e9f5a2975b Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2 2011-05-25 14:53:39 -07:00
Gilles Debunne
ecb43e5e67 am 5d48be98: Merge "Storage stats on external SD card in Settings." into honeycomb-mr2
* commit '5d48be9845eea3c4539f78f06ed24c592803e10c':
  Storage stats on external SD card in Settings.
2011-05-25 14:28:34 -07:00
Gilles Debunne
5d48be9845 Merge "Storage stats on external SD card in Settings." into honeycomb-mr2 2011-05-25 14:26:25 -07:00
Amith Yamasani
84272f1aa8 Fix blank Battery Use screen due to changes in framework.
Changes in the framework to increase horizontal space for preferences
that don't have a "widget" caused BatteryUse preference to go blank.
Removed the widget_frame id from the layout file.

Change-Id: Ib67227eb3a7ae4019b22d9b89040f72aff63b605
2011-05-25 12:57:04 -07:00
Gilles Debunne
104ea2873d Storage stats on external SD card in Settings.
Storage categories are dynamically created from list of StorageVolumes instead
of a static XML.

Unknown files' sizes are part of Misc rather than Apps.

Categories with a size of 0 are removed.

TODO : remove the notion of a "nosdcard" product. Change strings accordingly.
See all TODO in code

Change-Id: I017ac20f5fa50ad9bdeba8e666754ec84acf3858
2011-05-25 12:12:22 -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
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
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
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