summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Use new TTS engine API in TTS settingsBjorn Bringert2011-04-151-299/+257
| | | | | | | | | | | | | | | | | | | | | | | | Requires TTS engine API added in change I7614ff788e11f897e87052f684f1b4938d539fb7 Bug: 4148725 Change-Id: I5f3fa3bbcbf4e62af23bb701bcb6e8e5d8511341
* | | A few tweaks to the battery history chart.Dianne Hackborn2011-04-131-5/+12
| | | | | | | | | | | | Change-Id: Id133267592acf7a979a625704d2d922a24f5ff41
* | | am 386185a3: am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug codeGlenn Kasten2011-04-131-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '386185a3754535cd75c35091135b2933e39872bd': Bug 4167061 remove debug code
| * | am 315b452c: am 4f4ddaa8: Bug 4167061 remove debug codeGlenn Kasten2011-04-131-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '315b452c322f2eeeeb0ec946e31656ca93b8c0a7': Bug 4167061 remove debug code
| | * am 4f4ddaa8: Bug 4167061 remove debug codeGlenn Kasten2011-04-131-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '4f4ddaa823bfa7bd2fdff97338ff1839739925dd': Bug 4167061 remove debug code
| | | * Bug 4167061 remove debug codeGlenn Kasten2011-04-131-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1a05b820030d503b4ae1a82789ad4607e46b43c0
* | | | am fc52971f: am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2Glenn Kasten2011-04-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fc52971f7e0e4409d4a78686e23a5e330e559fb8': HDCP debugging in setting app part 2 of 2
| * | | am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2Glenn Kasten2011-04-111-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710': HDCP debugging in setting app part 2 of 2
| | * | am 858fd9a0: HDCP debugging in setting app part 2 of 2Glenn Kasten2011-04-111-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '858fd9a0302c6d34781133137a048a9bf668632a': HDCP debugging in setting app part 2 of 2
| | | * HDCP debugging in setting app part 2 of 2Glenn Kasten2011-04-111-1/+1
| | | | | | | | | | | | | | | | Change-Id: I931c50938526adce521a7bf02301aba75abaacaf
* | | | Merge "Tolerate missing AccountManager resource, not just missing resource name"Brian Carlstrom2011-04-082-5/+19
|\ \ \ \
| * | | | Tolerate missing AccountManager resource, not just missing resource nameBrian Carlstrom2011-04-072-5/+19
| | | | | | | | | | | | | | | | | | | | Change-Id: I29ceed33a9cc8e697bfd3226f6ec58291c36daae
* | | | | Remove the deprecated things from Config.java. These havent been working ↵Joe Onorato2011-04-073-4/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | since before 1.0. Change-Id: I88ea860fd6edf7c128cf1a201329f09428ab382c
* | | | advanced settingsJoe Onorato2011-04-061-4/+35
| | | | | | | | | | | | | | | | Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be
* | | | am 42f178d1: resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aospKenny Root2011-03-301-48/+145
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '42f178d10bcad0a8c04f20b2dfd2e3c28117a7cf': Settings: Improved UX when viewing open source license info.
| * | | resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aospKenny Root2011-03-301-48/+145
| |\ \ \ | | |/ / | |/| | | | | | Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58
| | * | am 7fceefa7: Merge "Settings: Improved UX when viewing open source license ↵Kenny Root2011-03-291-48/+145
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info." * commit '7fceefa79229ece2efab0446841543a8f8f20a1d': Settings: Improved UX when viewing open source license info.
| | | * | Settings: Improved UX when viewing open source license info.Henrik Carlsson2011-03-291-48/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added spinning progress indicator to the open source license dialog. The actual file loading is now handled by a separate thread, in order to provide user feedback and reduce risk for ANR. Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6
| | * | | am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no ↵Mike Lockwood2011-03-141-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer take UID parameter * commit 'e6c7e45fdb5f23462693ea76eeac9489dd5c8dac': DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
| | | * | | DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take ↵Mike Lockwood2011-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UID parameter Bug: 4061035 Change-Id: Idfec53b1da7b9b981c1c762468a3f69f78fedd7a Signed-off-by: Mike Lockwood <lockwood@android.com>
| | * | | | am 36469186: DO NOT MERGE WiMAX settings menuTK MUN2011-03-092-3/+42
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '36469186b7459d13688a2ca1c2316dbf172794dd': DO NOT MERGE WiMAX settings menu
| | | * | | DO NOT MERGE WiMAX settings menuTK MUN2011-03-092-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Show the 4G menu. 2. Show the 4G MAC address 3. Execute 4G setting apk. Change-Id: Id9d5551e5bfdb7d79279de42b36ec0ebccdf6099 Signed-off-by: TK MUN <tk.mun@samsung.com>
* | | | | | am 823a6ee9: am e9fdee0e: am 81cb6be8: Merge "Fix NPE in ↵Jake Hamby2011-03-293-9/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1 * commit '823a6ee9ec95e0278ae77b37392c873e86bfe071': Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
| * | | | | am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and ↵Jake Hamby2011-03-293-9/+9
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | non-BT devices." into honeycomb-mr1 * commit '81cb6be834f4604f6b58d8516f2b8e12620a3d16': Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.
| | * | | | Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.Jake Hamby2011-03-283-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NPE when entering Settings app in the SDK (and for devices without Bluetooth). Also remove the "Bluetooth settings" item in addition to the Bluetooth toggle item from Wireless settings when BT is missing. Bug: 4149307 Change-Id: Iecc5960a193cf88664d3217b4d7bdbc2276dabc0
* | | | | | am ce0976cc: am 2ba97451: am f3b325f5: Debug feature for HDCP compliance ↵Amith Yamasani2011-03-231-2/+51
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing. * commit 'ce0976cccd8a283689b15e33ce2cfaf819620bf6': Debug feature for HDCP compliance testing.
| * | | | | am f3b325f5: Debug feature for HDCP compliance testing.Amith Yamasani2011-03-231-2/+51
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f3b325f54dadb482d73111ab17cf6a51784de11a': Debug feature for HDCP compliance testing.
| | * | | | Debug feature for HDCP compliance testing.Amith Yamasani2011-03-231-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4149811 Add a setting in Application->Development to change HDCP checking. Change-Id: I5561b097b3fd7dbfc4eaf1977b80a37fc29572aa
generated by cgit v1.1 at 2025-01-10 09:49:22 +0000