diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-10-07 19:41:19 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2014-10-09 13:13:25 +0900 |
| commit | 81a5a10476a8ada6bbcaeb58d7c23d05f4ec1ab0 (patch) | |
| tree | cdb837da177b722f4871a6b66600e970c4849b18 /java/src/com/android/inputmethod/latin/Dictionary.java | |
| parent | 3c6ac75c48e0f57d389305c9c22a3be960682ed2 (diff) | |
| download | latinime-81a5a10476a8ada6bbcaeb58d7c23d05f4ec1ab0.tar.gz latinime-81a5a10476a8ada6bbcaeb58d7c23d05f4ec1ab0.tar.xz latinime-81a5a10476a8ada6bbcaeb58d7c23d05f4ec1ab0.zip | |
[ML19] Actually switch the language when appropriate
That is, when auto-correcting or when manually picking.
This is not great, but it's a good starting point.
Bug: 11230254
Change-Id: I07627f48e2de1c28053d6572c7c72625808ec79c
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Dictionary.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Dictionary.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/Dictionary.java b/java/src/com/android/inputmethod/latin/Dictionary.java index 43561ba4b..e66847b56 100644 --- a/java/src/com/android/inputmethod/latin/Dictionary.java +++ b/java/src/com/android/inputmethod/latin/Dictionary.java @@ -16,6 +16,7 @@ package com.android.inputmethod.latin; +import com.android.inputmethod.annotations.UsedForTesting; import com.android.inputmethod.keyboard.ProximityInfo; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; import com.android.inputmethod.latin.settings.SettingsValuesForSuggestion; @@ -36,19 +37,19 @@ public abstract class Dictionary { // The following types do not actually come from real dictionary instances, so we create // corresponding instances. public static final String TYPE_USER_TYPED = "user_typed"; - public static final Dictionary DICTIONARY_USER_TYPED = new PhonyDictionary(TYPE_USER_TYPED); + public static final PhonyDictionary DICTIONARY_USER_TYPED = new PhonyDictionary(TYPE_USER_TYPED); public static final String TYPE_APPLICATION_DEFINED = "application_defined"; - public static final Dictionary DICTIONARY_APPLICATION_DEFINED = + public static final PhonyDictionary DICTIONARY_APPLICATION_DEFINED = new PhonyDictionary(TYPE_APPLICATION_DEFINED); public static final String TYPE_HARDCODED = "hardcoded"; // punctuation signs and such - public static final Dictionary DICTIONARY_HARDCODED = + public static final PhonyDictionary DICTIONARY_HARDCODED = new PhonyDictionary(TYPE_HARDCODED); // Spawned by resuming suggestions. Comes from a span that was in the TextView. public static final String TYPE_RESUMED = "resumed"; - public static final Dictionary DICTIONARY_RESUMED = + public static final PhonyDictionary DICTIONARY_RESUMED = new PhonyDictionary(TYPE_RESUMED); // The following types of dictionary have actual functional instances. We don't need final @@ -182,9 +183,10 @@ public abstract class Dictionary { * Not a true dictionary. A placeholder used to indicate suggestions that don't come from any * real dictionary. */ - private static class PhonyDictionary extends Dictionary { - // This class is not publicly instantiable. - private PhonyDictionary(final String type) { + @UsedForTesting + static class PhonyDictionary extends Dictionary { + @UsedForTesting + PhonyDictionary(final String type) { super(type, null); } |