Fix TTS for Zen mode voice activity.

Don't finish activity until TTS has finished.
Incorrect TTS for mix of hours / mins - e.g. 1 hour 45 minutes.
Improve the description of TTS strings for translators.

BUG: 20248251
BUG: 21413212
BUG: 21411622

Change-Id: Id2693ea82b76492216147012216ba07ce75a9d12

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/android/settings/utils/VoiceSettingsActivity.java b/src/com/android/settings/utils/VoiceSettingsActivity.java
index e81c7e8..4477e92 100644
--- a/src/com/android/settings/utils/VoiceSettingsActivity.java
+++ b/src/com/android/settings/utils/VoiceSettingsActivity.java
@@ -65,7 +65,12 @@ abstract public class VoiceSettingsActivity extends Activity {
      */
     protected void notifySuccess(CharSequence prompt) {
         if (getVoiceInteractor() != null) {
-            getVoiceInteractor().submitRequest(new CompleteVoiceRequest(prompt, null));
+            getVoiceInteractor().submitRequest(new CompleteVoiceRequest(prompt, null) {
+                @Override
+                public void onCompleteResult(Bundle options) {
+                    finish();
+                }
+            });
         }
     }