Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 732912a1 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 3730 into donut 

* changes:
  Restructuring the TTS files so that it works as a Service
parents f31cbbf5 f85aa5a4

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 \

tts/java/android/tts/ITts.aidl→core/java/android/speech/tts/ITts.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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;

tts/java/android/tts/ITtsCallback.aidl→core/java/android/speech/tts/ITtsCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.tts;

package android.speech.tts;



/**

 * AIDL for the callback from the TTS Service

core/java/android/speech/tts/Tts.java

+4 −3
Original line number Diff line number Diff line
@@ -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 {

packages/TtsService/Android.mk

0 → 100644
+13 −0
Original line number Diff line number Diff line 
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))