diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-10-03 13:20:51 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 13:20:51 -0700 |
| commit | 9ca0e511e8a604dabb2ce0055ed38501af66eb6d (patch) | |
| tree | 53eb6e06377a3df55f72b062ca599fff4f399a7c /java/src/com/android/inputmethod/latin/RichInputConnection.java | |
| parent | 12f9d9cc8599fcff2e250c4d62e8a4fb69a4db33 (diff) | |
| parent | 086ffdcc30196bf5aae1dbc95ea1b0463880035a (diff) | |
| download | latinime-9ca0e511e8a604dabb2ce0055ed38501af66eb6d.tar.gz latinime-9ca0e511e8a604dabb2ce0055ed38501af66eb6d.tar.xz latinime-9ca0e511e8a604dabb2ce0055ed38501af66eb6d.zip | |
am 086ffdcc: am 6c0e48b1: am 4350a93a: Merge "Fix the offdevice regression test build"
* commit '086ffdcc30196bf5aae1dbc95ea1b0463880035a':
Fix the offdevice regression test build
Diffstat (limited to 'java/src/com/android/inputmethod/latin/RichInputConnection.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/RichInputConnection.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java index 925381b50..8580a6e54 100644 --- a/java/src/com/android/inputmethod/latin/RichInputConnection.java +++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java @@ -30,6 +30,7 @@ import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.settings.SettingsValues; import com.android.inputmethod.latin.utils.CapsModeUtils; import com.android.inputmethod.latin.utils.DebugLogUtils; +import com.android.inputmethod.latin.utils.SpannableStringUtils; import com.android.inputmethod.latin.utils.StringUtils; import com.android.inputmethod.latin.utils.TextRange; import com.android.inputmethod.research.ResearchLogger; @@ -610,8 +611,9 @@ public final class RichInputConnection { // We don't use TextUtils#concat because it copies all spans without respect to their // nature. If the text includes a PARAGRAPH span and it has been split, then // TextUtils#concat will crash when it tries to concat both sides of it. - return new TextRange(StringUtils.concatWithNonParagraphSuggestionSpansOnly(before, after), - startIndexInBefore, before.length() + endIndexInAfter, before.length()); + return new TextRange( + SpannableStringUtils.concatWithNonParagraphSuggestionSpansOnly(before, after), + startIndexInBefore, before.length() + endIndexInAfter, before.length()); } public boolean isCursorTouchingWord(final SettingsValues settingsValues) { |