From f85aa5a4d4e6f1ef7e07638568e27d709b8085c6 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Wed, 10 Jun 2009 10:39:55 -0700 Subject: [PATCH] Restructuring the TTS files so that it works as a Service --- Android.mk | 4 +- .../java/android/speech}/tts/ITts.aidl | 4 +- .../android/speech}/tts/ITtsCallback.aidl | 2 +- core/java/android/speech/tts/Tts.java | 7 +- packages/TtsService/Android.mk | 13 ++ packages/TtsService/AndroidManifest.xml | 15 ++ packages/TtsService/MODULE_LICENSE_APACHE2 | 0 packages/TtsService/NOTICE | 190 ++++++++++++++++++ {tts => packages/TtsService}/jni/Android.mk | 0 .../jni/android_tts_SynthProxy.cpp | 0 .../src}/android/tts/SynthProxy.java | 0 .../src}/android/tts/TtsService.java | 7 +- 12 files changed, 231 insertions(+), 11 deletions(-) rename {tts/java/android => core/java/android/speech}/tts/ITts.aidl (92%) rename {tts/java/android => core/java/android/speech}/tts/ITtsCallback.aidl (96%) create mode 100644 packages/TtsService/Android.mk create mode 100755 packages/TtsService/AndroidManifest.xml create mode 100644 packages/TtsService/MODULE_LICENSE_APACHE2 create mode 100644 packages/TtsService/NOTICE rename {tts => packages/TtsService}/jni/Android.mk (100%) rename {tts => packages/TtsService}/jni/android_tts_SynthProxy.cpp (100%) rename {tts/java => packages/TtsService/src}/android/tts/SynthProxy.java (100%) rename {tts/java => packages/TtsService/src}/android/tts/TtsService.java (99%) diff --git a/Android.mk b/Android.mk index 0567ca6eb3d6b..bffd04cdb9f57 100644 --- a/Android.mk +++ b/Android.mk @@ -119,6 +119,8 @@ LOCAL_SRC_FILES += \ core/java/android/view/IWindowSession.aidl \ core/java/android/speech/IRecognitionListener.aidl \ core/java/android/speech/IRecognitionService.aidl \ + core/java/android/speech/tts/ITts.aidl \ + core/java/android/speech/tts/ITtsCallback.aidl \ core/java/com/android/internal/app/IBatteryStats.aidl \ core/java/com/android/internal/app/IUsageStats.aidl \ core/java/com/android/internal/appwidget/IAppWidgetService.aidl \ @@ -148,8 +150,6 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \ telephony/java/com/android/internal/telephony/IIccPhoneBook.aidl \ telephony/java/com/android/internal/telephony/ISms.aidl \ - tts/java/android/tts/ITtsCallback.aidl \ - tts/java/android/tts/ITts.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \ vpn/java/android/net/vpn/IVpnService.aidl \ diff --git a/tts/java/android/tts/ITts.aidl b/core/java/android/speech/tts/ITts.aidl similarity index 92% rename from tts/java/android/tts/ITts.aidl rename to core/java/android/speech/tts/ITts.aidl index 3558f5a370ef8..739a8e4e6f137 100755 --- a/tts/java/android/tts/ITts.aidl +++ b/core/java/android/speech/tts/ITts.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.tts; +package android.speech.tts; -import android.tts.ITtsCallback; +import android.speech.tts.ITtsCallback; import android.content.Intent; diff --git a/tts/java/android/tts/ITtsCallback.aidl b/core/java/android/speech/tts/ITtsCallback.aidl similarity index 96% rename from tts/java/android/tts/ITtsCallback.aidl rename to core/java/android/speech/tts/ITtsCallback.aidl index 131401025ba22..48ed73e021658 100755 --- a/tts/java/android/tts/ITtsCallback.aidl +++ b/core/java/android/speech/tts/ITtsCallback.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.tts; +package android.speech.tts; /** * AIDL for the callback from the TTS Service diff --git a/core/java/android/speech/tts/Tts.java b/core/java/android/speech/tts/Tts.java index 0c52910b19311..085b030611ffb 100755 --- a/core/java/android/speech/tts/Tts.java +++ b/core/java/android/speech/tts/Tts.java @@ -15,8 +15,8 @@ */ package android.speech.tts; -import android.tts.ITts; -import android.tts.ITtsCallback; +import android.speech.tts.ITts; +import android.speech.tts.ITtsCallback; import android.content.ComponentName; import android.content.Context; @@ -29,7 +29,6 @@ import android.os.RemoteException; import android.util.Log; /** - * @hide * * Synthesizes speech from text. This abstracts away the complexities of using * the TTS service such as setting up the IBinder connection and handling @@ -39,8 +38,10 @@ import android.util.Log; * necessary TTS apk installed, the behavior is that all calls to the TTS act as * no-ops. * + * {@hide} */ //FIXME #TTS# review + complete javadoc +//FIXME RENAME TO TextToSpeech.java public class Tts { diff --git a/packages/TtsService/Android.mk b/packages/TtsService/Android.mk new file mode 100644 index 0000000000000..2737fb4387c65 --- /dev/null +++ b/packages/TtsService/Android.mk @@ -0,0 +1,13 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := user + +LOCAL_SRC_FILES := $(call all-subdir-java-files) \ + +LOCAL_PACKAGE_NAME := TtsService +LOCAL_CERTIFICATE := platform + +include $(BUILD_PACKAGE) + +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/packages/TtsService/AndroidManifest.xml b/packages/TtsService/AndroidManifest.xml new file mode 100755 index 0000000000000..1dc25c6873455 --- /dev/null +++ b/packages/TtsService/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/packages/TtsService/MODULE_LICENSE_APACHE2 b/packages/TtsService/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/packages/TtsService/NOTICE b/packages/TtsService/NOTICE new file mode 100644 index 0000000000000..64aaa8dbd68e6 --- /dev/null +++ b/packages/TtsService/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2009, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/tts/jni/Android.mk b/packages/TtsService/jni/Android.mk similarity index 100% rename from tts/jni/Android.mk rename to packages/TtsService/jni/Android.mk diff --git a/tts/jni/android_tts_SynthProxy.cpp b/packages/TtsService/jni/android_tts_SynthProxy.cpp similarity index 100% rename from tts/jni/android_tts_SynthProxy.cpp rename to packages/TtsService/jni/android_tts_SynthProxy.cpp diff --git a/tts/java/android/tts/SynthProxy.java b/packages/TtsService/src/android/tts/SynthProxy.java similarity index 100% rename from tts/java/android/tts/SynthProxy.java rename to packages/TtsService/src/android/tts/SynthProxy.java diff --git a/tts/java/android/tts/TtsService.java b/packages/TtsService/src/android/tts/TtsService.java similarity index 99% rename from tts/java/android/tts/TtsService.java rename to packages/TtsService/src/android/tts/TtsService.java index 2373e96577279..c2c76fd34060e 100755 --- a/tts/java/android/tts/TtsService.java +++ b/packages/TtsService/src/android/tts/TtsService.java @@ -15,7 +15,8 @@ */ package android.tts; -import android.tts.ITts.Stub; +import android.speech.tts.ITts.Stub; +import android.speech.tts.ITtsCallback; import android.app.Service; import android.content.Context; @@ -91,7 +92,7 @@ public class TtsService extends Service implements OnCompletionListener { private static final String CATEGORY = "android.intent.category.TTS"; private static final String PKGNAME = "android.tts"; - final RemoteCallbackList mCallbacks = new RemoteCallbackList(); + final RemoteCallbackList mCallbacks = new RemoteCallbackList(); private Boolean mIsSpeaking; private ArrayList mSpeechQueue; @@ -537,7 +538,7 @@ public class TtsService extends Service implements OnCompletionListener { return null; } - private final ITts.Stub mBinder = new Stub() { + private final android.speech.tts.ITts.Stub mBinder = new Stub() { public void registerCallback(ITtsCallback cb) { if (cb != null)