Merge "Remove debug mode from the settings preference"
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 102187b..cbfc3c3 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -107,7 +107,7 @@
android:title="@string/prefs_enable_log"
android:summary="@string/prefs_description_log"
android:persistent="true"
- android:defaultValue="false" />
+ android:defaultValue="true" />
<ListPreference
android:key="pref_keyboard_layout_20100902"
android:title="@string/keyboard_layout"
@@ -123,4 +123,4 @@
android:targetPackage="com.android.inputmethod.latin"
android:targetClass="com.android.inputmethod.latin.DebugSettings" />
</Preference>-->
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index fe7aac7..a8cdfc0 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -32,14 +32,14 @@
public final List<SuggestedWordInfo> mSuggestedWordInfoList;
private SuggestedWords(List<CharSequence> words, boolean typedWordValid,
- boolean hasMinamlSuggestion, List<SuggestedWordInfo> suggestedWordInfoList) {
+ boolean hasMinimalSuggestion, List<SuggestedWordInfo> suggestedWordInfoList) {
if (words != null) {
mWords = words;
} else {
mWords = Collections.emptyList();
}
mTypedWordValid = typedWordValid;
- mHasMinimalSuggestion = hasMinamlSuggestion;
+ mHasMinimalSuggestion = hasMinimalSuggestion;
mSuggestedWordInfoList = suggestedWordInfoList;
}
@@ -113,8 +113,8 @@
return this;
}
- public Builder setHasMinimalSuggestion(boolean hasMinamlSuggestion) {
- mHasMinimalSuggestion = hasMinamlSuggestion;
+ public Builder setHasMinimalSuggestion(boolean hasMinimalSuggestion) {
+ mHasMinimalSuggestion = hasMinimalSuggestion;
return this;
}