Fix:port_android:Ask user if they want to start voice data download dialog, if there's no voice data available.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6028 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 21 insertions, 4 deletions

diff --git a/navit/android/res/values/strings.xml b/navit/android/res/values/strings.xml
index 3081c0bc..895e527c 100644
--- a/navit/android/res/values/strings.xml
+++ b/navit/android/res/values/strings.xml
@@ -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>
 
diff --git a/navit/android/src/org/navitproject/navit/NavitSpeech2.java b/navit/android/src/org/navitproject/navit/NavitSpeech2.java
index fd12ae36..b4ec85d4 100644
--- a/navit/android/src/org/navitproject/navit/NavitSpeech2.java
+++ b/navit/android/src/org/navitproject/navit/NavitSpeech2.java
@@ -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 @@ public class NavitSpeech2 implements TextToSpeech.OnInitListener, NavitActivityR
 				// 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();
 			}
 		}
 	}