Fix bug 2022411.

Added support for TTS language files to be loaded from the system partition if
they are not available on the regular path (sdcard). This involves changing
the check for the availability of a language (first check in the system path,
then check the sdcard), and the language switch code (try to load from the
system path if cannot load from sdcard).
Modified the CheckVoiceData activity (which checks for the installation of
all language files) to check on both the sdcard and the system path.
Added makefiles for copying language files to the system image,
PicoLangDefaultInSystem.mk will be used in another CL to copy a default language
to the system.

7 files changed, 98 insertions, 0 deletions

diff --git a/pico/lang/PicoLangDeDeInSystem.mk b/pico/lang/PicoLangDeDeInSystem.mk
new file mode 100644
index 0000000..174bc1b
--- /dev/null
+++ b/pico/lang/PicoLangDeDeInSystem.mk
@@ -0,0 +1,14 @@
+#
+# Installation of de-DE for the Pico TTS engine in the system image
+# 
+# Include this file in a product makefile to include the language files for de-DE
+#
+# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
+# 
+
+LOCAL_PATH:= external/svox/pico/lang
+
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/de-DE_gl0_sg.bin:system/tts/lang_pico/de-DE_gl0_sg.bin \
+	$(LOCAL_PATH)/de-DE_ta.bin:system/tts/lang_pico/de-DE_ta.bin
+
diff --git a/pico/lang/PicoLangDefaultInSystem.mk b/pico/lang/PicoLangDefaultInSystem.mk
new file mode 100644
index 0000000..5e31e82
--- /dev/null
+++ b/pico/lang/PicoLangDefaultInSystem.mk
@@ -0,0 +1,14 @@
+#
+# Installation of a default language for the Pico TTS engine
+# 
+# Include this file in a product makefile to include the language files for english US
+#
+# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
+# 
+
+LOCAL_PATH:= external/svox/pico/lang
+
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/en-US_lh0_sg.bin:system/tts/lang_pico/en-US_lh0_sg.bin \
+	$(LOCAL_PATH)/en-US_ta.bin:system/tts/lang_pico/en-US_ta.bin
+
diff --git a/pico/lang/PicoLangEnGBInSystem.mk b/pico/lang/PicoLangEnGBInSystem.mk
new file mode 100644
index 0000000..a07f50e
--- /dev/null
+++ b/pico/lang/PicoLangEnGBInSystem.mk
@@ -0,0 +1,14 @@
+#
+# Installation of en-GB for the Pico TTS engine in the system image
+# 
+# Include this file in a product makefile to include the language files for en-GB
+#
+# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
+# 
+
+LOCAL_PATH:= external/svox/pico/lang
+
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/en-GB_kh0_sg.bin:system/tts/lang_pico/en-GB_kh0_sg.bin \
+	$(LOCAL_PATH)/en-GB_ta.bin:system/tts/lang_pico/en-GB_ta.bin
+
diff --git a/pico/lang/PicoLangEnUsInSystem.mk b/pico/lang/PicoLangEnUsInSystem.mk
new file mode 100644
index 0000000..5ac7646
--- /dev/null
+++ b/pico/lang/PicoLangEnUsInSystem.mk
@@ -0,0 +1,14 @@
+#
+# Installation of en-US for the Pico TTS engine in the system image
+# 
+# Include this file in a product makefile to include the language files for english US
+#
+# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
+# 
+
+LOCAL_PATH:= external/svox/pico/lang
+
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/en-US_lh0_sg.bin:system/tts/lang_pico/en-US_lh0_sg.bin \
+	$(LOCAL_PATH)/en-US_ta.bin:system/tts/lang_pico/en-US_ta.bin
+
diff --git a/pico/lang/PicoLangEsEsInSystem.mk b/pico/lang/PicoLangEsEsInSystem.mk
new file mode 100644
index 0000000..49165f2
--- /dev/null
+++ b/pico/lang/PicoLangEsEsInSystem.mk
@@ -0,0 +1,14 @@
+#
+# Installation of es-ES for the Pico TTS engine in the system image
+# 
+# Include this file in a product makefile to include the language files for es-ES
+#
+# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
+# 
+
+LOCAL_PATH:= external/svox/pico/lang
+
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/es-ES_zl0_sg.bin:system/tts/lang_pico/es-ES_zl0_sg.bin \
+	$(LOCAL_PATH)/es-ES_ta.bin:system/tts/lang_pico/es-ES_ta.bin
+
diff --git a/pico/lang/PicoLangFrFrInSystem.mk b/pico/lang/PicoLangFrFrInSystem.mk
new file mode 100644
index 0000000..619a0cf
--- /dev/null
+++ b/pico/lang/PicoLangFrFrInSystem.mk
@@ -0,0 +1,14 @@
+#
+# Installation of fr-FR for the Pico TTS engine in the system image
+# 
+# Include this file in a product makefile to include the language files for fr-FR
+#
+# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
+# 
+
+LOCAL_PATH:= external/svox/pico/lang
+
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/fr-FR_nk0_sg.bin:system/tts/lang_pico/fr-FR_nk0_sg.bin \
+	$(LOCAL_PATH)/fr-FR_ta.bin:system/tts/lang_pico/fr-FR_ta.bin
+
diff --git a/pico/lang/PicoLangItItInSystem.mk b/pico/lang/PicoLangItItInSystem.mk
new file mode 100644
index 0000000..c10cf36
--- /dev/null
+++ b/pico/lang/PicoLangItItInSystem.mk
@@ -0,0 +1,14 @@
+#
+# Installation of it-IT for the Pico TTS engine in the system image
+# 
+# Include this file in a product makefile to include the language files for it-IT
+#
+# Note the destination path matches that used in external/svox/pico/tts/com_svox_picottsengine.cpp
+# 
+
+LOCAL_PATH:= external/svox/pico/lang
+
+PRODUCT_COPY_FILES += \
+	$(LOCAL_PATH)/it-IT_cm0_sg.bin:system/tts/lang_pico/it-IT_cm0_sg.bin \
+	$(LOCAL_PATH)/it-IT_ta.bin:system/tts/lang_pico/it-IT_ta.bin
+