diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml/rowkeys_arabic2.xml | 6 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_farsi2.xml | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 5 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Suggest.java | 5 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/UserHistoryDictionary.java | 1 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java (renamed from java/src/com/android/inputmethod/latin/AutoCorrection.java) | 12 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/ByteArrayWrapper.java (renamed from java/src/com/android/inputmethod/latin/ByteArrayWrapper.java) | 2 |
8 files changed, 23 insertions, 16 deletions
diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml index 00e69ace7..4f8090d01 100644 --- a/java/res/xml/rowkeys_arabic2.xml +++ b/java/res/xml/rowkeys_arabic2.xml @@ -59,14 +59,14 @@ latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" latin:keyLabelFlags="fontNormal" /> <!-- U+0627: "ا" ARABIC LETTER ALEF + U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE U+0621: "ء" ARABIC LETTER HAMZA - U+0671: "ٱ" ARABIC LETTER ALEF WASLA U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW - U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> + U+0671: "ٱ" ARABIC LETTER ALEF WASLA --> <Key latin:keyLabel="ا" - latin:moreKeys="ء,ٱ,أ,إ,آ" + latin:moreKeys="!fixedColumnOrder!5,آ,ء,أ,إ,ٱ" latin:keyLabelFlags="fontNormal" /> <!-- U+062A: "ت" ARABIC LETTER TEH --> <Key diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml index fc6789eba..590161f62 100644 --- a/java/res/xml/rowkeys_farsi2.xml +++ b/java/res/xml/rowkeys_farsi2.xml @@ -47,14 +47,14 @@ latin:keyLabel="ل" latin:keyLabelFlags="fontNormal" /> <!-- U+0627: "ا" ARABIC LETTER ALEF + U+0671: "ٱ" ARABIC LETTER ALEF WASLA U+0621: "ء" ARABIC LETTER HAMZA U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE - U+0671: "ٱ" ARABIC LETTER ALEF WASLA U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW --> <Key latin:keyLabel="ا" - latin:moreKeys="ء,آ,أ,ٱ,إ" + latin:moreKeys="!fixedColumnOrder!5,ٱ,ء,آ,أ,إ" latin:keyLabelFlags="fontNormal" /> <!-- U+062A: "ت" ARABIC LETTER TEH U+0629: "ة": ARABIC LETTER TEH MARBUTA --> diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 7890dbb3f..1e2a1a6bd 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -77,6 +77,7 @@ import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.suggestions.SuggestionStripView; import com.android.inputmethod.latin.utils.ApplicationUtils; +import com.android.inputmethod.latin.utils.AutoCorrectionUtils; import com.android.inputmethod.latin.utils.CapsModeUtils; import com.android.inputmethod.latin.utils.CollectionUtils; import com.android.inputmethod.latin.utils.CompletionInfoUtils; @@ -2428,7 +2429,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen || SuggestedWordInfo.KIND_OOV_CORRECTION == suggestionInfo.mKind) && mSuggest != null // If the suggestion is not in the dictionary, the hint should be shown. - && !AutoCorrection.isValidWord(mSuggest, suggestion, true); + && !AutoCorrectionUtils.isValidWord(mSuggest, suggestion, true); if (mSettings.isInternal()) { LatinImeLoggerUtils.onSeparator((char)Constants.CODE_SPACE, @@ -2496,7 +2497,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen } // We demote unrecognized words (frequency < 0, below) by specifying them as "invalid". // We don't add words with 0-frequency (assuming they would be profanity etc.). - final int maxFreq = AutoCorrection.getMaxFrequency( + final int maxFreq = AutoCorrectionUtils.getMaxFrequency( suggest.getUnigramDictionaries(), suggestion); if (maxFreq == 0) return null; userHistoryDictionary.addToUserHistory(prevWord, secondWord, maxFreq > 0); diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java index 8b31f4e99..ac497ec9f 100644 --- a/java/src/com/android/inputmethod/latin/Suggest.java +++ b/java/src/com/android/inputmethod/latin/Suggest.java @@ -22,6 +22,7 @@ import android.text.TextUtils; import com.android.inputmethod.annotations.UsedForTesting; import com.android.inputmethod.keyboard.ProximityInfo; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; +import com.android.inputmethod.latin.utils.AutoCorrectionUtils; import com.android.inputmethod.latin.utils.BoundedTreeSet; import com.android.inputmethod.latin.utils.CollectionUtils; import com.android.inputmethod.latin.utils.StringUtils; @@ -231,7 +232,7 @@ public final class Suggest { // or if it's a 2+ characters non-word (i.e. it's not in the dictionary). final boolean allowsToBeAutoCorrected = (null != whitelistedWord && !whitelistedWord.equals(consideredWord)) - || (consideredWord.length() > 1 && !AutoCorrection.isValidWord(this, + || (consideredWord.length() > 1 && !AutoCorrectionUtils.isValidWord(this, consideredWord, wordComposer.isFirstCharCapitalized())); final boolean hasAutoCorrection; @@ -252,7 +253,7 @@ public final class Suggest { // auto-correct. hasAutoCorrection = false; } else { - hasAutoCorrection = AutoCorrection.suggestionExceedsAutoCorrectionThreshold( + hasAutoCorrection = AutoCorrectionUtils.suggestionExceedsAutoCorrectionThreshold( suggestionsSet.first(), consideredWord, mAutoCorrectionThreshold); } diff --git a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java index 8c668b810..2370ebe43 100644 --- a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java +++ b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java @@ -25,6 +25,7 @@ import com.android.inputmethod.annotations.UsedForTesting; import com.android.inputmethod.keyboard.ProximityInfo; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions; +import com.android.inputmethod.latin.utils.ByteArrayWrapper; import com.android.inputmethod.latin.utils.CollectionUtils; import com.android.inputmethod.latin.utils.UserHistoryDictIOUtils; import com.android.inputmethod.latin.utils.UserHistoryDictIOUtils.BigramDictionaryInterface; diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java index ce340b666..1dd04fc4d 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java +++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java @@ -45,10 +45,10 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.inputmethod.latin.AutoCorrection; import com.android.inputmethod.latin.LatinImeLogger; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.SuggestedWords; +import com.android.inputmethod.latin.utils.AutoCorrectionUtils; import com.android.inputmethod.latin.utils.ResourceUtils; import com.android.inputmethod.latin.utils.ViewLayoutUtils; @@ -279,7 +279,7 @@ final class SuggestionStripLayoutHelper { // If we auto-correct, then the autocorrection is in slot 0 and the typed word // is in slot 1. if (positionInStrip == mCenterPositionInStrip - && AutoCorrection.shouldBlockAutoCorrectionBySafetyNet( + && AutoCorrectionUtils.shouldBlockAutoCorrectionBySafetyNet( suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION), suggestedWords.getWord(SuggestedWords.INDEX_OF_TYPED_WORD))) { return 0xFFFF0000; diff --git a/java/src/com/android/inputmethod/latin/AutoCorrection.java b/java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java index 86be4295a..066c5fd32 100644 --- a/java/src/com/android/inputmethod/latin/AutoCorrection.java +++ b/java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java @@ -14,8 +14,12 @@ * limitations under the License. */ -package com.android.inputmethod.latin; +package com.android.inputmethod.latin.utils; +import com.android.inputmethod.latin.BinaryDictionary; +import com.android.inputmethod.latin.Dictionary; +import com.android.inputmethod.latin.LatinImeLogger; +import com.android.inputmethod.latin.Suggest; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; import android.text.TextUtils; @@ -23,12 +27,12 @@ import android.util.Log; import java.util.concurrent.ConcurrentHashMap; -public final class AutoCorrection { +public final class AutoCorrectionUtils { private static final boolean DBG = LatinImeLogger.sDBG; - private static final String TAG = AutoCorrection.class.getSimpleName(); + private static final String TAG = AutoCorrectionUtils.class.getSimpleName(); private static final int MINIMUM_SAFETY_NET_CHAR_LENGTH = 4; - private AutoCorrection() { + private AutoCorrectionUtils() { // Purely static class: can't instantiate. } diff --git a/java/src/com/android/inputmethod/latin/ByteArrayWrapper.java b/java/src/com/android/inputmethod/latin/utils/ByteArrayWrapper.java index 15f70c50c..1bb27aa2b 100644 --- a/java/src/com/android/inputmethod/latin/ByteArrayWrapper.java +++ b/java/src/com/android/inputmethod/latin/utils/ByteArrayWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.inputmethod.latin; +package com.android.inputmethod.latin.utils; import com.android.inputmethod.latin.makedict.BinaryDictInputOutput.FusionDictionaryBufferInterface; |