commit e18fdf804acdc7cd8db19c2a03adecc44d71f1ef
author Jean Chalard <jchalard@google.com> Wed Aug 14 07:27:54 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 14 07:27:54 2013 +0000
tree 3f9893f6aded7ed0b0358c3b1c559483de7e4677
parent 90619ae02b1861e644db6a0d72d0e5f9c195ef3e
parent a74ae9c451a057e7580737df328d5a972fee17af

Merge "Fix a bug with surrogate pairs"

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index b14ee31..46cf8ec 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2558,8 +2558,8 @@
             }
         }
         mWordComposer.setComposingWord(typedWord, mKeyboardSwitcher.getKeyboard());
-        // TODO: this is in chars but the callee expects code points!
-        mWordComposer.setCursorPositionWithinWord(numberOfCharsInWordBeforeCursor);
+        mWordComposer.setCursorPositionWithinWord(
+                typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor));
         mConnection.setComposingRegion(
                 mLastSelectionStart - numberOfCharsInWordBeforeCursor,
                 mLastSelectionEnd + range.getNumberOfCharsInWordAfterCursor());