Merge change 9078 into donut

* changes:
  Updating binary voice files for en-US for better quality. Changing the Intent extra for getting the voice data root directory to match the current naming of that variable in TextToSpeech.java.

4 files changed, 2 insertions, 4 deletions

diff --git a/pico/lang/en-US_ta.bin b/pico/lang/en-US_ta.bin
index 3b654a9..16b60ba 100755
--- a/pico/lang/en-US_ta.bin
+++ b/pico/lang/en-US_ta.bin
diff --git a/picolanginstaller/AndroidManifest.xml b/picolanginstaller/AndroidManifest.xml
index 209f797..52ffd29 100755
--- a/picolanginstaller/AndroidManifest.xml
+++ b/picolanginstaller/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.svox.langpack.installer"
-      android:versionCode="1"
+      android:versionCode="5"
       android:versionName="1.0">
     <uses-sdk android:minSdkVersion="donut" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/picolanginstaller/res/raw/svoxlangpack.zip b/picolanginstaller/res/raw/svoxlangpack.zip
index 18b042f..dff43c8 100755
--- a/picolanginstaller/res/raw/svoxlangpack.zip
+++ b/picolanginstaller/res/raw/svoxlangpack.zip
diff --git a/picolanginstaller/src/com/svox/langpack/installer/InstallerActivity.java b/picolanginstaller/src/com/svox/langpack/installer/InstallerActivity.java
index 5c85afe..98345a4 100755
--- a/picolanginstaller/src/com/svox/langpack/installer/InstallerActivity.java
+++ b/picolanginstaller/src/com/svox/langpack/installer/InstallerActivity.java
@@ -36,7 +36,7 @@ public class InstallerActivity extends Activity {
     public void onActivityResult(int requestCode, int resultCode, Intent data){
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == DATA_ROOT_DIRECTORY_REQUEST_CODE) {
-            rootDirectory = data.getStringExtra(TextToSpeech.Engine.VOICE_DATA_ROOT_DIRECTORY);
+            rootDirectory = data.getStringExtra(TextToSpeech.Engine.EXTRA_VOICE_DATA_ROOT_DIRECTORY);
             runInstaller();
         }
     }
@@ -116,9 +116,7 @@ public class InstallerActivity extends Activity {
         }
 
         public void run() {
-            Log.e("lang pack installer", "Start");
             boolean succeeded = unzipLangPack(stream);
-            Log.e("lang pack installer", "Done!");
             if (succeeded) {
                 runOnUiThread(new uninstallDisplayer());
             } else {