diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-02-21 04:00:15 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 04:00:15 -0800 |
| commit | 8f7aca42aca47cfe3826cd3155cf0dd6745d4cb0 (patch) | |
| tree | 0a06302e779c3d2ff6870087243c368eb5c9d457 | |
| parent | 3792a64e48bb02f70ffe65dee35a5d8ac9c47837 (diff) | |
| parent | 296adf5710fed09eb0b5e038ef2ce6f55914c8f6 (diff) | |
| download | latinime-8f7aca42aca47cfe3826cd3155cf0dd6745d4cb0.tar.gz latinime-8f7aca42aca47cfe3826cd3155cf0dd6745d4cb0.tar.xz latinime-8f7aca42aca47cfe3826cd3155cf0dd6745d4cb0.zip | |
am 296adf57: Merge "Change a heuristic and add a log."
* commit '296adf5710fed09eb0b5e038ef2ce6f55914c8f6':
Change a heuristic and add a log.
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/RichInputConnection.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 9ded5a85e..44282a492 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -750,6 +750,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen + ", word caps = " + ((editorInfo.inputType & InputType.TYPE_TEXT_FLAG_CAP_WORDS) != 0)); } + Log.i(TAG, "Starting input. Cursor position = " + + editorInfo.initialSelStart + "," + editorInfo.initialSelEnd); if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); ResearchLogger.latinIME_onStartInputViewInternal(editorInfo, prefs); diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java index 0e85b3c77..30b20a335 100644 --- a/java/src/com/android/inputmethod/latin/RichInputConnection.java +++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java @@ -847,9 +847,9 @@ public final class RichInputConnection { mExpectedSelStart = mExpectedSelEnd = Constants.NOT_A_CURSOR_POSITION; } else { final int textLength = textBeforeCursor.length(); - if (textLength > mExpectedSelStart - || (textLength < Constants.EDITOR_CONTENTS_CACHE_SIZE - && mExpectedSelStart < Constants.EDITOR_CONTENTS_CACHE_SIZE)) { + if (textLength < Constants.EDITOR_CONTENTS_CACHE_SIZE + && (textLength > mExpectedSelStart + || mExpectedSelStart < Constants.EDITOR_CONTENTS_CACHE_SIZE)) { // It should not be possible to have only one of those variables be // NOT_A_CURSOR_POSITION, so if they are equal, either the selection is zero-sized // (simple cursor, no selection) or there is no cursor/we don't know its pos |