[Navit-cvs-commit] SF.net SVN: navit:[6028] trunk/navit

[<md...@us...>]

Revision: 6028
          http://sourceforge.net/p/navit/code/6028
Author:   mdankov
Date:     2015-03-24 20:54:21 +0000 (Tue, 24 Mar 2015)
Log Message:
-----------
Fix:port_android:Ask user if they want to start voice data download dialog, if there's no voice data available.

Modified Paths:
--------------
    trunk/navit/navit/android/res/values/strings.xml
    trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java
    trunk/navit/po/ru.po.in

Modified: trunk/navit/navit/android/res/values/strings.xml
===================================================================
--- trunk/navit/navit/android/res/values/strings.xml	2015-03-24 08:33:08 UTC (rev 6027)
+++ trunk/navit/navit/android/res/values/strings.xml	2015-03-24 20:54:21 UTC (rev 6028)
@@ -71,5 +71,9 @@
 	<string name="select_backup">Select backup</string>
 	<string name="backup">Backup</string>
 	<string name="restore">Restore</string>
+	
+	<!-- TTS -->
+	<string name="TTS_title_data_missing">System text to speech engine data is missing</string>
+	<string name="TTS_qery_install_data">Navit can use any text to speech engine installed on your device. The currently selected engine reports it is unable to speak in your language. Should we ask the system to show voice download dialog?</string>
 </resources>
 

Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java
===================================================================
--- trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java	2015-03-24 08:33:08 UTC (rev 6027)
+++ trunk/navit/navit/android/src/org/navitproject/navit/NavitSpeech2.java	2015-03-24 20:54:21 UTC (rev 6028)
@@ -20,7 +20,10 @@
 package org.navitproject.navit;
 
 import android.content.Intent;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.pm.PackageManager;
+import android.app.AlertDialog;
 import android.speech.tts.TextToSpeech;
 import android.util.Log;
 
@@ -44,10 +47,20 @@
 				// success, create the TTS instance
 				mTts = new TextToSpeech(navit, this);
 			} else {
-				// missing data, install it
-				Intent installIntent = new Intent();
-				installIntent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
-				navit.startActivity(installIntent);
+				// missing data, ask to install it
+				AlertDialog.Builder builder = new AlertDialog.Builder(navit);
+			    	builder
+				.setTitle(R.string.TTS_title_data_missing)
+				.setMessage(R.string.TTS_qery_install_data)
+				.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int which) {			      	
+						Intent installIntent = new Intent();
+						installIntent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
+						navit.startActivity(installIntent);
+	    				}
+				})
+			    	.setNegativeButton(R.string.no, null)
+			    	.show();
 			}
 		}
 	}

Modified: trunk/navit/po/ru.po.in
===================================================================
--- trunk/navit/po/ru.po.in	2015-03-24 08:33:08 UTC (rev 6027)
+++ trunk/navit/po/ru.po.in	2015-03-24 20:54:21 UTC (rev 6028)
@@ -2629,3 +2629,20 @@
 #. Android resource: @strings/restore
 msgid "Restore"
 msgstr "Восстановление из копии"
+
+#. Android resource: @strings/TTS_title_data_missing
+msgid "System text to speech engine data is missing"
+msgstr "Отсутствуют данные системного приложения преобразования текста в речь"
+
+#. Android resource: @strings/TTS_qery_install_data
+msgid ""
+"Navit can use any text to speech engine installed on your device. The "
+"currently selected engine reports it is unable to speak in your language. "
+"Should we ask the system to show voice download dialog?"
+msgstr ""
+"Navit может использовать любое приложение преобразования текста в "
+"речь, установленное на Вашем устройстве. Активное сейчас приложение "
+"сообщило о невозможности говорить на Вашем языке. Попросим систему "
+"показать диалог загрузки голосовых данных?"
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.