diff options
| author |   Dan Zivkovic <zivkovic@google.com> | 2015-03-12 17:22:37 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-12 17:22:37 +0000 |
| commit | b724ff1d11d10da8569bba472e2d3252086047cc (patch) | |
| tree | 1172623d89367a88a9ca7cc189f14c76e5943666 /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | 2c3aae8a0cc45a5e1888d3b9d9a1a8d3779c945a (diff) | |
| parent | 7e1dfaae3d6ca9aff1acfa9b358ad0b759ef0ec8 (diff) | |
| download | latinime-b724ff1d11d10da8569bba472e2d3252086047cc.tar.gz latinime-b724ff1d11d10da8569bba472e2d3252086047cc.tar.xz latinime-b724ff1d11d10da8569bba472e2d3252086047cc.zip | |
am 7e1dfaae: Merge "Remove ALS from LatinIME."
* commit '7e1dfaae3d6ca9aff1acfa9b358ad0b759ef0ec8':
Remove ALS from LatinIME.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/RichInputMethodManager.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/RichInputMethodManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java index 602205b59..ef946c8bc 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -334,11 +334,11 @@ public class RichInputMethodManager { } @Nonnull - public Locale[] getCurrentSubtypeLocales() { + public Locale getCurrentSubtypeLocale() { if (null != sForcedSubtypeForTesting) { - return sForcedSubtypeForTesting.getLocales(); + return sForcedSubtypeForTesting.getLocale(); } - return getCurrentSubtype().getLocales(); + return getCurrentSubtype().getLocale(); } @Nonnull |