summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am f0fae7f2: am 6356b17a: am d671182d: Merge "make setup wizard\'s wifi and ↵Freeman Ng2011-06-011-1/+1
|\ | | | | | | | | | | | | datetime settings look good for 7"" into honeycomb-mr2 * commit 'f0fae7f27295df2dff531a6293840479a64f7984': make setup wizard's wifi and datetime settings look good for 7"
| * am 6356b17a: am d671182d: Merge "make setup wizard\'s wifi and datetime ↵Freeman Ng2011-05-261-1/+1
| |\ | | | | | | | | | | | | | | | | | | settings look good for 7"" into honeycomb-mr2 * commit '6356b17a53fc939c145de26dbc258ef7797ba05c': make setup wizard's wifi and datetime settings look good for 7"
| | * am d671182d: Merge "make setup wizard\'s wifi and datetime settings look ↵Freeman Ng2011-05-261-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | good for 7"" into honeycomb-mr2 * commit 'd671182d88a193bee25d82a1941a57a84ed0fdc4': make setup wizard's wifi and datetime settings look good for 7"
| | | * Merge "make setup wizard's wifi and datetime settings look good for 7"" into ↵Freeman Ng2011-05-251-1/+1
| | | |\ | | | | | | | | | | | | | | | honeycomb-mr2
| | | | * make setup wizard's wifi and datetime settings look good for 7"Freeman Ng2011-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Bug 4505185: fix NPE when file list is empty"Gilles Debunne2011-06-011-0/+1
|\ \ \ \ \
| * | | | | Bug 4505185: fix NPE when file list is emptyGilles Debunne2011-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia120f92f2d907cdfccde5824179ef2e1f0c0d6a6
* | | | | | Accessibility service specific settings.Svetoslav Ganov2011-05-272-15/+120
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the settings part of the change for adding support for accessibility service specific settings. 1. Added the first cut of a SettingsCheckBoxPreference that is a CheckBoxPreference that optionally takes an intent to be lauched as settings of the item represented by the preference. 2. Updated the AccessibilitySettigns to use the SettingsCheckBoxPreference. Change-Id: If44262b8965c65620c6b8c252f8ef356eb0d95cf
* | | | | Merge "Dream (screensaver) settings."Daniel Sandler2011-05-264-15/+381
|\ \ \ \ \
| * | | | | Dream (screensaver) settings.Daniel Sandler2011-05-264-15/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depends on change Ied691856 for Settings.Secure.DREAM_TIMEOUT and Settings.Secure.DREAM_COMPONENT. Change-Id: Ib6f74b74036e12637efb891b97e459a4e33444e7
* | | | | | resolved conflicts for merge of b593a628 to masterGilles Debunne2011-05-266-975/+1052
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / Change-Id: Icf8a913e8780bb7d998cc9f4d0ed91ed66348dc6
| * | | | am ecb43e5e: am 5d48be98: Merge "Storage stats on external SD card in ↵Gilles Debunne2011-05-257-987/+1054
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Settings." into honeycomb-mr2 * commit 'ecb43e5e67e2cdf7617100b08a3f9dae42c4b5cf': Storage stats on external SD card in Settings.
| | * | | am 5d48be98: Merge "Storage stats on external SD card in Settings." into ↵Gilles Debunne2011-05-257-987/+1054
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit '5d48be9845eea3c4539f78f06ed24c592803e10c': Storage stats on external SD card in Settings.
| | | * | Merge "Storage stats on external SD card in Settings." into honeycomb-mr2Gilles Debunne2011-05-257-987/+1054
| | | |\ \
| | | | * | Storage stats on external SD card in Settings.Gilles Debunne2011-05-257-987/+1054
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 0fbaacaa: am 138a695f: am cfd524f0: Visual adjustments for smaller tablets.Amith Yamasani2011-05-252-3/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0fbaacaa9b29401a4191ca85dccfe68660928a11': Visual adjustments for smaller tablets.
| * | | | am 138a695f: am cfd524f0: Visual adjustments for smaller tablets.Amith Yamasani2011-05-252-3/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '138a695f179aa16bff033b873f502161b1be66e0': Visual adjustments for smaller tablets.
| | * | | am cfd524f0: Visual adjustments for smaller tablets.Amith Yamasani2011-05-252-3/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'cfd524f07af0820e2e41fd74e7e3c5b7433854f8': Visual adjustments for smaller tablets.
| | | * | Visual adjustments for smaller tablets.Amith Yamasani2011-05-242-3/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the Manage Apps tab indicators horizontally scrollable. Use medium font size for user dictionary. Bug: 4462313 Change-Id: Iba44e758715c0187ea17ed072794b8596dee0e54
* | | | am b7c2d5b4: am 7c210ba5: Fix invalid linkspeed displayIrfan Sheriff2011-05-241-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b7c2d5b4e1bafe543d3887d350b3e77d71a0cf34': Fix invalid linkspeed display
| * | | am 7c210ba5: Fix invalid linkspeed displayIrfan Sheriff2011-05-231-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7c210ba5c18c2720023dd8fc4215cde95a6fe71c': Fix invalid linkspeed display
| | * | Fix invalid linkspeed displayIrfan Sheriff2011-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 4391449 Change-Id: I8c8efcaa73d09c1e8b523f7798b6c626edc96c1e
* | | | am 87661736: am 5ee2fb92: Merge "Fix submit button display for WPS" into ↵Irfan Sheriff2011-05-241-5/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '8766173651668a18b3cf8ea2ce545d5178eddb6c': Fix submit button display for WPS
| * | | am 5ee2fb92: Merge "Fix submit button display for WPS" into honeycomb-LTEIrfan Sheriff2011-05-231-5/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5ee2fb92a9e05dda877a497847c7543daaf5ea69': Fix submit button display for WPS
| | * | Fix submit button display for WPSIrfan Sheriff2011-05-201-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Icd3fde90 exposed an existing issue where password validity was being checked for WPS as well. Fix it. Bug: 4391449 Change-Id: I60ca8869eee680f5ec71284a1ac6ba956a992312
* | | | am ba46f269: am a6f178a8: Merge "Fix enabling of submit button" into ↵Irfan Sheriff2011-05-191-7/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'ba46f269abf8cbafaf68902a23935a1779aa316d': Fix enabling of submit button
| * | | am a6f178a8: Merge "Fix enabling of submit button" into honeycomb-LTEIrfan Sheriff2011-05-191-7/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'a6f178a817ec36d5cf6d6a3d9c19c73278f0c3ca': Fix enabling of submit button
| | * | Fix enabling of submit buttonIrfan Sheriff2011-05-191-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Change the interface for user dictionary multiple locales.Jean Chalard2011-05-184-67/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Move to KeyChain.bindBrian Carlstrom2011-05-171-25/+10
| | | | | | | | | | | | | | | | Change-Id: Ic12e84bdc2e391c4a08a0f854d0e0f7315fc31a3
* | | | Merge "Make CertInstaller installed CA certs trusted by applications via ↵Brian Carlstrom2011-05-171-8/+70
|\ \ \ \ | | | | | | | | | | | | | | | default TrustManager (5 of 6)"
| * | | | Make CertInstaller installed CA certs trusted by applications via default ↵Brian Carlstrom2011-05-161-8/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Refactoring in memory storage stats"Gilles Debunne2011-05-163-59/+48
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactoring in memory storage statsGilles Debunne2011-05-133-59/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Fix NPE in InputMethodAndLanguageSettingssatok2011-05-141-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 4422368 Change-Id: I495eb8de9928922b18b37c6658bd8fd8b4ee3e1a
* | | | Merge "Fixes in UsageBarPreference"Gilles Debunne2011-05-133-13/+15
|\ \ \ \
| * | | | Fixes in UsageBarPreferenceGilles Debunne2011-05-063-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Enable showing the user dictionary in several locales.Jean Chalard2011-05-112-6/+67
|/ / / / | | | | | | | | | | | | | | | | Bug: 3479738 Change-Id: Ic57a5675c44c36ad255f9927da151ad6a2a8c44c
* | | | Use the old TTS settings API for now.Narayan Kamath2011-05-051-10/+11
| | | | | | | | | | | | | | | | Change-Id: I8ca3fcb0aee5572694e573f4ceaa0df261c807c3
* | | | am d65d1adb: am 3c3490c8: Use new RouteInfo class.Robert Greenwalt2011-05-021-5/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd65d1adb5613107583f0cf208d7650c822f581e2': Use new RouteInfo class.
| * | | am 3c3490c8: Use new RouteInfo class.Robert Greenwalt2011-05-021-5/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3c3490c819a1a6ce72468c1d867429ac0f86def8': Use new RouteInfo class.
| | * | Use new RouteInfo class.Robert Greenwalt2011-04-291-5/+9
| | | | | | | | | | | | | | | | Change-Id: I144ebb87e6d1809f59ebd32e64e186d836a365f8
* | | | Merge "Fix 3402408: Manage "continue" button in ConfirmPassword screen"Jim Miller2011-04-261-2/+23
|\ \ \ \
| * | | | Fix 3402408: Manage "continue" button in ConfirmPassword screenJim Miller2011-04-181-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This disables the "continue" button until the user has entered at least one character. Change-Id: I3192e1789ba89031ac4cc90f388b32b7af19a445
* | | | | am ac706b98: am 2c3ec092: Remove getCurrentDataConnectionList.Wink Saville2011-04-201-35/+35
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'ac706b987bad5b46c4f10be0284ae1ed4453261b': Remove getCurrentDataConnectionList.
| * | | | am 2c3ec092: Remove getCurrentDataConnectionList.Wink Saville2011-04-201-35/+35
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '2c3ec09261bf1503e75328175b5286af5676845e': Remove getCurrentDataConnectionList.
| | * | | Remove getCurrentDataConnectionList.Wink Saville2011-04-201-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'll add another mechanism which will probably use an asynchronous interface with the DataConnectionTracker. Change-Id: I71f80bb9fe0496c42ff9b1ddbf4e36a68d3f1592
* | | | | Fix crash if no external storage.Dianne Hackborn2011-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If5b0386b686d65cf9026a3c00459db371ab81b3a
* | | | | Fix TTS engine checkbox click handlerBjorn Bringert2011-04-191-0/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Fix 4283049: Restore continue/cancel buttons in LockScreen SettingsJim Miller2011-04-152-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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