summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
|\
| * undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| |\
| | * reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |\ | |/ / |/| / | |/
| * am c659351a: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-260-0/+0
| |\ | | | | | | | | | | | | * commit 'c659351ad768dbc200bafc80b422908771087280': Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
| | * Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-251-5/+5
| |/ |/| | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: Ia9892afbd743662a2272882bcdda7f23ae9d3b6d
| * am 8ff1c4b5: Merge "Import revised translations."Eric Fischer2011-10-181-0/+30
| |\ | |/ |/| | | | | * commit '8ff1c4b5c920402885c1435bab0e85a83b030f6f': Import revised translations.
* | Merge "Import revised translations."Eric Fischer2011-10-181-0/+30
|\ \
| * | Import revised translations.Eric Fischer2011-10-181-0/+30
| | | | | | | | | | | | Change-Id: Ib271cf1da25d0900b2d7ca66bc1d4da410f3c683
| | * am b53127de: (-s ours) am a359cef5: (-s ours) Import revised translations. ↵Eric Fischer2011-10-180-0/+0
| | |\ | |/ / | | / | |/ |/| | | | | DO NOT MERGE * commit 'b53127def7b7a6103f55f3f1dca81546dea36ef9': Import revised translations. DO NOT MERGE
* | am a359cef5: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-180-0/+0
|\ \ | |/ |/| | | | | * commit 'a359cef5690df6c8220448f646390b9dd775a673': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-181-0/+30
|/ | | | Change-Id: I600ca0456457730365e0994b36e7b5eb3cfbb936
* Import revised translations.Eric Fischer2011-09-121-2/+2
| | | | Change-Id: I8fe29ddd44cd2ef7bfb8b82c905fdcbec9eec4e1
* Import revised translations.Eric Fischer2011-08-2646-93/+93
| | | | Change-Id: Iac304832d7eba6e174c0a57b8665abc47f2f622d
* Part of effort to remove "failure" messaging to end-users.Claudia de Veaux2011-08-161-2/+2
| | | | | | Bug: 5165745 Change-Id: I6143f286c6657715e78da38023beab7325571dd0
* Import revised translations.Eric Fischer2011-07-251-2/+2
| | | | Change-Id: I6c4ab9a45040b45334c1ed5db16781287103f8fc
* Import revised translations.Eric Fischer2011-07-151-1/+1
| | | | Change-Id: Id9401c0515048a9304d440dd910c11799932eaa7
* Remove the simulator target from all makefiles.Jeff Brown2011-07-112-11/+1
| | | | | | Bug: 5010576 Change-Id: Ia539a6a831a7d500d0c5336438e0bc0ff5854bf0
* Merge "Fix a pico bug."Narayan Kamath2011-06-281-2/+1
|\
| * Fix a pico bug.Narayan Kamath2011-06-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | This is one of 10 million errors (really) reported by valgrind. I verified that some of them are OK, but it's probably not worth going through the rest. I expect most of those are just optimized code and fancy bit trickery. Change-Id: I3b8675ec8267691a5e6127a8e03239547107053e
* | Use the new settings API for pico.Narayan Kamath2011-06-272-0/+18
|/ | | | Change-Id: I852d0619d0f5bcb7218d3ab266ae86d117bc95e7
* libttspico should be optional, installed only when PicoTts is.Narayan Kamath2011-06-211-1/+3
| | | | Change-Id: I6b5b81dc2c18d8a2b96074080304bfbdbc479fdc
* Import revised translations.Eric Fischer2011-06-205-10/+10
| | | | Change-Id: Iac021b1920fbfecfeabc66e4159bb820491e338c
* Update pico to use the new TTS API.Narayan Kamath2011-06-083-12/+14
| | | | Change-Id: Ied389be15bfcd1a1c3ed289a0b1d6c7f7913629a
* Import revised translations.Eric Fischer2011-05-265-0/+150
| | | | Change-Id: Ia21e17027e288049d7fc95bee9223c005a1a58e6
* Fix TTS breakageNarayan Kamath2011-05-231-2/+0
| | | | | bug:4476001 Change-Id: I14f4c5d803fc95bcaf11bc3ac182df4133083281
* Minor makefile refactoring.Narayan Kamath2011-05-191-4/+26
| | | | | | | | This allows folks to depend on libttspico_static and just call getTtsEngine() directly instead of all the dlopen() dlsym() business. Change-Id: I7b5b6c94d08b95ade9ba9c995e4bd2a862acdfb6
* Break dependency between pico and the audio system.Narayan Kamath2011-05-194-13/+28
| | | | | | | | | The TTS engine should use only TTS defined constants, and not constants from the audiosystem. This happened to work because PCM_16_BIT in native was the same as DEFAULT in java, which happened to be PCM_16_BIT. Change-Id: I0f43a46afff8c45d1eb18c1beaab62dce87b8055
* update for new audio.h header locationDima Zavin2011-05-111-1/+1
| | | | | Change-Id: I3bf2e6b3a0434f525dc1994f080f027482142ffd Signed-off-by: Dima Zavin <dima@android.com>
* svox: convert to use new audio.hDima Zavin2011-04-192-7/+8
| | | | | Change-Id: Id8e69601a0812a6a0034774adde672bb70662c6a Signed-off-by: Dima Zavin <dima@android.com>
* Clean JNI data pointer in shutdown()Bjorn Bringert2011-04-191-1/+2
| | | | | | | | Before, finalize() after shutdown() could segfault since shutdown() kept the pointer to the deleted SynthProxyJniStorage. Change-Id: I338c19758733425be2e3b0d9e66176d11d27e8f6
* Use new SynthesisRequest.error()Bjorn Bringert2011-04-191-6/+15
| | | | Change-Id: Ia634e6c84870ad6c2d1665da796adcd9cdc4ec8f
* Add external storage perm to PicoBjorn Bringert2011-04-181-1/+2
| | | | | | | | | | The TTS engine now needs to have its own permissions set, since it is running in its own process. Also removes the minSdkVersion=2 to let the build system set it automatically. Change-Id: I7aea73ee5a415179f9b8b44e8f73c024b93f8983
* Add DEFAULT category to Pico TTS serviceBjorn Bringert2011-04-181-0/+1
| | | | Change-Id: I4d94d41d3e5e9d9bd2b266ac4637c065ef13810a
* Port Pico to new TTS engine APIBjorn Bringert2011-04-1511-3/+1679
| | | | | | | | | | | | | | | | | | Requires TTS engine API added in change I7614ff788e11f897e87052f684f1b4938d539fb7 The compatibility layer in pico/compat/src/com/android/tts/compat/SynthProxy.java pico/compat/jni/com_android_tts_compat_SynthProxy.cpp is based on these files removed from the old TTS engine framework: frameworks/base/packages/TtsService/src/android/tts/SynthProxy.java frameworks/base/packages/TtsService/jni/android_tts_SynthProxy.cpp Bug: 4150618 Change-Id: I7a2cca6b5cfbac6158a87fad69cc796140adb2f3
* external/svox: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-1/+1
| | | | | Change-Id: I987cf0645cd1281e499426a29c82bdebd74f733b Signed-off-by: Iliyan Malchev <malchev@google.com>
* am baadee21: am 97a3fdf7: Merge "Remove duplicate item to avoid compiling error"David Turner2011-01-311-1/+0
|\ | | | | | | | | * commit 'baadee213d3350ab18fbd0c22a3ac3a65a853a4c': Remove duplicate item to avoid compiling error
| * am 97a3fdf7: Merge "Remove duplicate item to avoid compiling error"David Turner2011-01-311-1/+0
| |\ | | | | | | | | | | | | * commit '97a3fdf7c4228837745cdbe6ff5cb937e2a81b11': Remove duplicate item to avoid compiling error
| | * Merge "Remove duplicate item to avoid compiling error"David Turner2011-01-311-1/+0
| | |\
| | | * Remove duplicate item to avoid compiling errorChih-Wei Huang2010-12-181-1/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | The gcc 4.5 complains about the duplicate item: external/svox/pico/lib/picosig2.c: In function 'sigAllocate': external/svox/pico/lib/picosig2.c:75:26: error: operation on 'sig_inObj->int_vec38' may be undefined Change-Id: I4532b770ff02e058253ed01cbed50b0efb8a83ce
* | | Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: I9e9ed9561b018d8629e1c50a98dff1f45d78e2cd
| * \ \ Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ibd50471653e3ceec3404833d8833bb769a204cd4
| | * \ \ am 1c643c7e: (-s ours) Import translations for additional languages.Eric Fischer2011-01-250-0/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '1c643c7e8c13bb758249766b04a7b605179f06fa': Import translations for additional languages.
* | | | | am 4c2a2b9c: Remove redundant translations.Eric Fischer2011-01-261-6/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4c2a2b9c5a740420e8ceed9f6503fc3a7bdb48d4': Remove redundant translations.
| * | | | Remove redundant translations.Eric Fischer2011-01-261-6/+0
| |/ / / | | | | | | | | | | | | Change-Id: Ife383ea64d281351d533b4e413f268a3f1b0dfc7
* | | | am e308def0: Import some unabbreviated translations for large screens.Eric Fischer2011-01-071-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e308def046345231cae47314e4b5de86d9b79194': Import some unabbreviated translations for large screens.
| * | | Import some unabbreviated translations for large screens.Eric Fischer2011-01-061-0/+6
| | | | | | | | | | | | | | | | Change-Id: Ia34391f488d78ea8c7a980efc330b276500256d7
* | | | am 1c643c7e: Import translations for additional languages.Eric Fischer2011-01-060-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '1c643c7e8c13bb758249766b04a7b605179f06fa': Import translations for additional languages.
| * | Import translations for additional languages.Eric Fischer2011-01-0621-0/+630
| | | | | | | | | | | | Change-Id: I69ccc4d420e18384d551ed98cd5591aae1c782be
* | | Don't log an error when SSML has no language.Jean-Michel Trivi2011-01-051-1/+1
| | | | | | | | | | | | Change-Id: I3ce4ce7c121f3f72b242a0edf33b5f6f16e7fdac
* | | Fix bug 2782425 Use the current language if it matches that of the documentJean-Michel Trivi2011-01-041-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an utterance specifies its locale, the checkForLocale() function looks for the index of the supported language that matches it. If the exact locale is not supported, we look for language-only support. But there could already be a match with the currently loaded language. The fix consists in comparing the requested language with the one that is loaded (if any), so we don't load a new one uselessly, AND so the default language is used if it matches. Change-Id: I501d946459ea982466eb804b17e9c43a8203564a
generated by cgit v1.1 at 2024-06-11 12:00:14 +0000