Make IME Go-btn visible/pressable during dictation

Kaljurand · Sep 30, 2015 · 03ee180 · 03ee180
1 parent 635283e
commit 03ee180
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/app/src/ee/ioc/phon/android/speak/service/SpeechInputMethodService.java b/app/src/ee/ioc/phon/android/speak/service/SpeechInputMethodService.java
@@ -151,8 +151,9 @@ public void onSwitchIme(boolean isAskUser) {
 
             @Override
             public void onGo() {
+                closeSession();
                 performGo();
-                handleClose();
+                requestHideSelf(0);
             }
 
             @Override
@@ -219,11 +220,6 @@ private void closeSession() {
         }
     }
 
-    private void handleClose() {
-        requestHideSelf(0);
-        closeSession();
-    }
-
     private IBinder getToken() {
         final Dialog dialog = getWindow();
         if (dialog == null) {

diff --git a/app/src/ee/ioc/phon/android/speak/view/SpeechInputView.java b/app/src/ee/ioc/phon/android/speak/view/SpeechInputView.java
@@ -168,6 +168,7 @@ public boolean onLongClick(View v) {
             mBImeGo.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    cancelOrDestroy();
                     mListener.onGo();
                 }
             });
@@ -243,9 +244,8 @@ private void setGuiInitState(int message) {
             setText(mTvMessage, m);
         }
         setEnabled(mBComboSelector, true);
-        if (mBImeKeyboard != null && mBImeGo != null) {
+        if (mBImeKeyboard != null) {
             setVisibility(mBImeKeyboard, View.VISIBLE);
-            setVisibility(mBImeGo, View.VISIBLE);
         }
         setText(mTvInstruction, R.string.buttonImeSpeak);
     }
@@ -338,7 +338,7 @@ public void run() {
 
     private void updateServiceLanguage(ServiceLanguageChooser slc) {
         // Cancel a possibly running service
-        closeSession();
+        cancelOrDestroy();
         Pair<String, String> pair = Utils.getLabel(getContext(), slc.getCombo());
         mBComboSelector.setText(pair.second + " · " + pair.first);
         mRecognizer = slc.getSpeechRecognizer();
@@ -382,9 +382,8 @@ public void onReadyForSpeech(Bundle params) {
             setText(mTvInstruction, R.string.buttonImeStop);
             setText(mTvMessage, "");
             setEnabled(mBComboSelector, false);
-            if (mBImeKeyboard != null && mBImeGo != null) {
+            if (mBImeKeyboard != null) {
                 setVisibility(mBImeKeyboard, View.INVISIBLE);
-                setVisibility(mBImeGo, View.INVISIBLE);
             }
         }