aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-12-19 23:13:43 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-19 23:13:43 -0800
commitbab3f5b42461e29ecd0b0bea8f7274c06598388d (patch)
treec1b89e415974749384ad67c2e9b6f87abf1408b9
parentec471baa39c83d1905d3dcebe8f89a43cd982d9d (diff)
parent95d869fed4057f01262606d9cdfb4fd41ba0ce47 (diff)
downloadlatinime-bab3f5b42461e29ecd0b0bea8f7274c06598388d.tar.gz
latinime-bab3f5b42461e29ecd0b0bea8f7274c06598388d.tar.xz
latinime-bab3f5b42461e29ecd0b0bea8f7274c06598388d.zip
am 95d869fe: Merge "[IL19] Resolve a TODO."
* commit '95d869fed4057f01262606d9cdfb4fd41ba0ce47': [IL19] Resolve a TODO.
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java3
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 2c9426bf1..9175aad66 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -106,8 +106,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
Suggest.SuggestInitializationListener {
private static final String TAG = LatinIME.class.getSimpleName();
private static final boolean TRACE = false;
- // TODO[IL]: Make this private
- public static boolean DEBUG;
+ private static boolean DEBUG = false;
private static final int EXTENDED_TOUCHABLE_REGION_HEIGHT = 100;
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index f5dda990a..db27d22b7 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -933,7 +933,7 @@ public final class InputLogic {
final int separatorLength = mLastComposedWord.mSeparatorString.length();
// TODO: should we check our saved separator against the actual contents of the text view?
final int deleteLength = cancelLength + separatorLength;
- if (LatinIME.DEBUG) {
+ if (LatinImeLogger.sDBG) {
if (mWordComposer.isComposingWord()) {
throw new RuntimeException("revertCommit, but we are composing a word");
}