From df80a2042b64171311a89ebf0cfd5b1c4f464fcb Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Thu, 22 May 2014 07:25:33 +0000 Subject: [PATCH] bugfix: the keyboard should not show completions when entering web passwords --- .../ui/android/TranslatorInputMethodService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java index 13d5592da..58d2e6518 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java @@ -135,15 +135,16 @@ public class TranslatorInputMethodService extends InputMethodService // modify our behavior. int variation = attribute.inputType & InputType.TYPE_MASK_VARIATION; if (variation == InputType.TYPE_TEXT_VARIATION_PASSWORD || - variation == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) { + variation == InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD || + variation == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) { // Do not display predictions / what the user is typing // when they are entering a password. mPredictionOn = false; } - if (variation == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS - || variation == InputType.TYPE_TEXT_VARIATION_URI - || variation == InputType.TYPE_TEXT_VARIATION_FILTER) { + if (variation == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS || + variation == InputType.TYPE_TEXT_VARIATION_URI || + variation == InputType.TYPE_TEXT_VARIATION_FILTER) { // Our predictions are not useful for e-mail addresses // or URIs. mPredictionOn = false; @@ -475,7 +476,8 @@ public class TranslatorInputMethodService extends InputMethodService if (wordLength > 1) { mComposingWord.delete(wordLength - 1, wordLength); getCurrentInputConnection().setComposingText(getComposingString(), 1); - updateCandidates(); + if (mPredictionOn) + updateCandidates(); } else if (wordLength > 0) { mComposingWord.setLength(0); getCurrentInputConnection().setComposingText(getComposingString(), 1);