aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-02-06 01:37:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-06 01:37:47 -0800
commit5e6a8dd6d9e697d0adf9534c9dc081cebd0ff71f (patch)
treea7355226044d767014ac47ecea2d25cd8081b83f /java/src/com/android/inputmethod/latin
parent0cd292f20b19565274f4b5011ae422a129f3af32 (diff)
parentd645db1e37a376e71d56834033b82a07e6f387b8 (diff)
downloadlatinime-5e6a8dd6d9e697d0adf9534c9dc081cebd0ff71f.tar.gz
latinime-5e6a8dd6d9e697d0adf9534c9dc081cebd0ff71f.tar.xz
latinime-5e6a8dd6d9e697d0adf9534c9dc081cebd0ff71f.zip
am d645db1e: Merge "Move INCLUDE_RAW_SUGGESTIONS flag to ProductionFlag"
* commit 'd645db1e37a376e71d56834033b82a07e6f387b8': Move INCLUDE_RAW_SUGGESTIONS flag to ProductionFlag
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
-rw-r--r--java/src/com/android/inputmethod/latin/Suggest.java7
-rw-r--r--java/src/com/android/inputmethod/latin/define/ProductionFlag.java3
2 files changed, 6 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 0e16fc19a..5e74d75b0 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -20,6 +20,7 @@ import android.text.TextUtils;
import com.android.inputmethod.keyboard.ProximityInfo;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import com.android.inputmethod.latin.define.ProductionFlag;
import com.android.inputmethod.latin.utils.AutoCorrectionUtils;
import com.android.inputmethod.latin.utils.BoundedTreeSet;
import com.android.inputmethod.latin.utils.CollectionUtils;
@@ -51,8 +52,6 @@ public final class Suggest {
private static final int SUPPRESS_SUGGEST_THRESHOLD = -2000000000;
private static final boolean DBG = LatinImeLogger.sDBG;
- private static final boolean INCLUDE_RAW_SUGGESTIONS = false;
-
public final DictionaryFacilitatorForSuggest mDictionaryFacilitator;
private float mAutoCorrectionThreshold;
@@ -126,7 +125,7 @@ public final class Suggest {
wordComposerForLookup = wordComposer;
}
final ArrayList<SuggestedWordInfo> rawSuggestions;
- if (INCLUDE_RAW_SUGGESTIONS) {
+ if (ProductionFlag.INCLUDE_RAW_SUGGESTIONS) {
rawSuggestions = CollectionUtils.newArrayList();
} else {
rawSuggestions = null;
@@ -243,7 +242,7 @@ public final class Suggest {
final BoundedTreeSet suggestionsSet = new BoundedTreeSet(sSuggestedWordInfoComparator,
SuggestedWords.MAX_SUGGESTIONS);
final ArrayList<SuggestedWordInfo> rawSuggestions;
- if (INCLUDE_RAW_SUGGESTIONS) {
+ if (ProductionFlag.INCLUDE_RAW_SUGGESTIONS) {
rawSuggestions = CollectionUtils.newArrayList();
} else {
rawSuggestions = null;
diff --git a/java/src/com/android/inputmethod/latin/define/ProductionFlag.java b/java/src/com/android/inputmethod/latin/define/ProductionFlag.java
index dc937fb25..e6fa1cdad 100644
--- a/java/src/com/android/inputmethod/latin/define/ProductionFlag.java
+++ b/java/src/com/android/inputmethod/latin/define/ProductionFlag.java
@@ -29,4 +29,7 @@ public final class ProductionFlag {
public static final boolean USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG = false;
public static final boolean IS_HARDWARE_KEYBOARD_SUPPORTED = false;
+
+ // Include all suggestions from all dictionaries in {@link SuggestedWords#mRawSuggestions}.
+ public static final boolean INCLUDE_RAW_SUGGESTIONS = false;
}