diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-23 16:44:51 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 16:44:51 +0000 |
| commit | 3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c (patch) | |
| tree | 0ceda5aefb24fa3ffa8e52e3d1f8a8757f27296e /java/src/com/android/inputmethod/latin/RichInputMethodManager.java | |
| parent | cf4884c5a79e9260a82e7d4ed0eac264f987c230 (diff) | |
| parent | 6726bc90014c8d9c1710e4b52aa019d3e945f407 (diff) | |
| download | latinime-3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c.tar.gz latinime-3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c.tar.xz latinime-3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c.zip | |
am 6726bc90: Merge "Use Java 7 diamond operator"
* commit '6726bc90014c8d9c1710e4b52aa019d3e945f407':
Use Java 7 diamond operator
Diffstat (limited to '')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/RichInputMethodManager.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java index 64cc562c8..cbdc4b9eb 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -31,7 +31,6 @@ import android.view.inputmethod.InputMethodSubtype; import com.android.inputmethod.compat.InputMethodManagerCompatWrapper; import com.android.inputmethod.latin.settings.Settings; import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils; -import com.android.inputmethod.latin.utils.CollectionUtils; import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; import java.util.Collections; @@ -53,9 +52,9 @@ public final class RichInputMethodManager { private InputMethodManagerCompatWrapper mImmWrapper; private InputMethodInfoCache mInputMethodInfoCache; final HashMap<InputMethodInfo, List<InputMethodSubtype>> - mSubtypeListCacheWithImplicitlySelectedSubtypes = CollectionUtils.newHashMap(); + mSubtypeListCacheWithImplicitlySelectedSubtypes = new HashMap<>(); final HashMap<InputMethodInfo, List<InputMethodSubtype>> - mSubtypeListCacheWithoutImplicitlySelectedSubtypes = CollectionUtils.newHashMap(); + mSubtypeListCacheWithoutImplicitlySelectedSubtypes = new HashMap<>(); private static final int INDEX_NOT_FOUND = -1; |