diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java | 6 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java index 99bd08031..0970fb5a0 100644 --- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java @@ -482,9 +482,9 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke final int primaryCode = parentKey.mCode; if (parentKey.mMoreKeys == null && !parentKey.altCodeWhileTyping() && parentKey.mAltCode != Keyboard.CODE_UNSPECIFIED) { - // Long press on a key that has no more keys and not altCodeWhileTyping but altCode - // defined, such as "0 +" key on phone layout and "/ :" key on datetime - // layout. + // Long press on a key that has no more keys and is not altCodeWhileTyping, but altCode + // is defined, such as the "0 +" key on the phone layout and the "/ :" key on the + // datetime layout. tracker.onLongPressed(); invokeCodeInput(parentKey.mAltCode); invokeReleaseKey(primaryCode); diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 9b68acae4..0f9b983a3 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -980,7 +980,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar .setHasMinimalSuggestion(false); // When in fullscreen mode, show completions generated by the application final SuggestedWords words = builder.build(); - final boolean isAutoCorrection = Utils.willAutoCorrect(words); + final boolean isAutoCorrection = false; setSuggestions(words, isAutoCorrection); setAutoCorrectionIndicator(isAutoCorrection); // TODO: is this the right thing to do? What should we auto-correct to in @@ -1737,10 +1737,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar if (DEBUG) { Log.d(TAG, "Flip the indicator. " + oldAutoCorrectionIndicator + " -> " + newAutoCorrectionIndicator); - if (mComposingStateManager.isComposing() && newAutoCorrectionIndicator - != mComposingStateManager.isAutoCorrectionIndicatorOn()) { - throw new RuntimeException("Couldn't flip the indicator!"); - } } if (mWordComposer.isComposingWord()) { final CharSequence textWithUnderline = |