diff options
| author | Yohei Yukawa <yukawa@google.com> | 2015-02-20 15:28:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-20 15:28:35 +0000 |
| commit | e55524ef0482bfcf77bf1344f7fda9ef7263d32f (patch) | |
| tree | 16d1ab0455dbc9d23912cb589f4113baa42e50c3 /core/java/com | |
| parent | 1156da8c0dce2b2e12243f56f7d7bb6f62f7d07b (diff) | |
| parent | e72d1c82743c4d573e529d4da3866c1fcea35c77 (diff) | |
| download | frameworks_base-e55524ef0482bfcf77bf1344f7fda9ef7263d32f.zip frameworks_base-e55524ef0482bfcf77bf1344f7fda9ef7263d32f.tar.gz frameworks_base-e55524ef0482bfcf77bf1344f7fda9ef7263d32f.tar.bz2 | |
Merge "Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0"
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/inputmethod/InputMethodUtils.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/com/android/internal/inputmethod/InputMethodUtils.java b/core/java/com/android/internal/inputmethod/InputMethodUtils.java index 183527c..9ae9fa7 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodUtils.java +++ b/core/java/com/android/internal/inputmethod/InputMethodUtils.java @@ -35,6 +35,8 @@ import android.view.inputmethod.InputMethodSubtype; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; +import com.android.internal.annotations.VisibleForTesting; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -518,7 +520,8 @@ public class InputMethodUtils { return NOT_A_SUBTYPE_ID; } - private static ArrayList<InputMethodSubtype> getImplicitlyApplicableSubtypesLocked( + @VisibleForTesting + public static ArrayList<InputMethodSubtype> getImplicitlyApplicableSubtypesLocked( Resources res, InputMethodInfo imi) { final List<InputMethodSubtype> subtypes = InputMethodUtils.getSubtypes(imi); final String systemLocale = res.getConfiguration().locale.toString(); |