diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-01-10 00:03:05 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-01-10 00:03:05 -0800 |
| commit | 9c75ad1adec6e7ce2f2b202795fc23e0a4ac5617 (patch) | |
| tree | da64a52e360711bc0495dc135514972598d63e8c /java/src | |
| parent | a80b8fc98f321920bc045bb5fd9952680d0e439e (diff) | |
| parent | 912ad4614f4bd10d871b16b5307fed1405f8c1e2 (diff) | |
| download | latinime-9c75ad1adec6e7ce2f2b202795fc23e0a4ac5617.tar.gz latinime-9c75ad1adec6e7ce2f2b202795fc23e0a4ac5617.tar.xz latinime-9c75ad1adec6e7ce2f2b202795fc23e0a4ac5617.zip | |
Merge "Fix international tests"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java index fe2908428..eb0ec3990 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java +++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java @@ -31,6 +31,7 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; +import com.android.inputmethod.annotations.UsedForTesting; import com.android.inputmethod.keyboard.KeyboardSwitcher; import java.util.List; @@ -239,7 +240,14 @@ public final class SubtypeSwitcher { return mNeedsToDisplayLanguage.getValue(); } + private static Locale sForcedLocaleForTesting = null; + @UsedForTesting + void forceLocale(final Locale locale) { + sForcedLocaleForTesting = locale; + } + public Locale getCurrentSubtypeLocale() { + if (null != sForcedLocaleForTesting) return sForcedLocaleForTesting; return SubtypeLocale.getSubtypeLocale(getCurrentSubtype()); } |