am 1ea1e0b9: am 66d9c408: Forgot to add mdpi asset for globe icon. Fixes missing keyboard row on hvga.
Merge commit '1ea1e0b991f0fadeb22d327bed355c6177903ace'
* commit '1ea1e0b991f0fadeb22d327bed355c6177903ace':
Forgot to add mdpi asset for globe icon. Fixes missing keyboard row on hvga.
diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index 1a08b2c..f95ca1c 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -1291,7 +1291,7 @@
// If the user touches a typed word 2 times or more, it will become valid.
private static final int VALIDITY_THRESHOLD = 2 * FREQUENCY_FOR_PICKED;
// If the user touches a typed word 5 times or more, it will be added to the user dict.
- private static final int PROMOTION_THRESHOLD = 5 * FREQUENCY_FOR_PICKED;
+ private static final int PROMOTION_THRESHOLD = 4 * FREQUENCY_FOR_PICKED;
public AutoDictionary(Context context) {
super(context);
@@ -1300,7 +1300,7 @@
@Override
public boolean isValidWord(CharSequence word) {
final int frequency = getWordFrequency(word);
- return frequency > VALIDITY_THRESHOLD;
+ return frequency >= VALIDITY_THRESHOLD;
}
@Override
@@ -1308,9 +1308,10 @@
final int length = word.length();
// Don't add very short or very long words.
if (length < 2 || length > getMaxWordLength()) return;
- super.addWord(word, addFrequency);
- final int freq = getWordFrequency(word);
- if (freq > PROMOTION_THRESHOLD) {
+ int freq = getWordFrequency(word);
+ freq = freq < 0 ? addFrequency : freq + addFrequency;
+ super.addWord(word, freq);
+ if (freq >= PROMOTION_THRESHOLD) {
LatinIME.this.promoteToUserDictionary(word, FREQUENCY_FOR_AUTO_ADD);
}
}