From ac3cae616cfef053fdb59bebe5455dea1d51642c Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Wed, 25 Aug 2010 15:53:54 +0900 Subject: Merge from the private sandbox to the froyo-ub-latinimegoogle Bumped up the version to 0.22. Change-Id: I04497fa0a2acaa1b9632621c9d9f163cf40f6299 --- java/src/com/android/inputmethod/latin/BinaryDictionary.java | 4 ++-- java/src/com/android/inputmethod/latin/LatinIME.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index d0e143dd0..b081242a9 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -61,9 +61,9 @@ public class BinaryDictionary extends Dictionary { static { try { - System.loadLibrary("jni_latinime"); + System.loadLibrary("jni_latinime2"); } catch (UnsatisfiedLinkError ule) { - Log.e("BinaryDictionary", "Could not load native library jni_latinime"); + Log.e("BinaryDictionary", "Could not load native library jni_latinime2"); } } diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 0e6b18a06..2406eb8c3 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -768,6 +768,9 @@ public class LatinIME extends InputMethodService // Check if we should go in or out of correction mode. + // TODO: Uncomment this block when we enable re-editing feature + // If a word is selected + /* if (isPredictionOn() && mJustRevertedSeparator == null && (candidatesStart == candidatesEnd || newSelStart != oldSelStart || TextEntryState.isCorrecting()) @@ -779,6 +782,7 @@ public class LatinIME extends InputMethodService abortCorrection(false); } } + */ } @Override -- cgit v1.2.3-83-g751a