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 /tools/dicttool/compat/android | |
| 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 'tools/dicttool/compat/android')
| -rw-r--r-- | tools/dicttool/compat/android/util/SparseArray.java | 6 | ||||
| -rw-r--r-- | tools/dicttool/compat/android/util/SparseIntArray.java | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/dicttool/compat/android/util/SparseArray.java b/tools/dicttool/compat/android/util/SparseArray.java index 6c76f19f4..9efbd39c7 100644 --- a/tools/dicttool/compat/android/util/SparseArray.java +++ b/tools/dicttool/compat/android/util/SparseArray.java @@ -16,8 +16,6 @@ package android.util; -import com.android.inputmethod.latin.utils.CollectionUtils; - import java.util.ArrayList; import java.util.Collections; @@ -30,8 +28,8 @@ public class SparseArray<E> { } public SparseArray(final int initialCapacity) { - mKeys = CollectionUtils.newArrayList(initialCapacity); - mValues = CollectionUtils.newArrayList(initialCapacity); + mKeys = new ArrayList<>(initialCapacity); + mValues = new ArrayList<>(initialCapacity); } public int size() { diff --git a/tools/dicttool/compat/android/util/SparseIntArray.java b/tools/dicttool/compat/android/util/SparseIntArray.java index ac8a04ceb..e4d3dfd07 100644 --- a/tools/dicttool/compat/android/util/SparseIntArray.java +++ b/tools/dicttool/compat/android/util/SparseIntArray.java @@ -24,7 +24,7 @@ public class SparseIntArray { } public SparseIntArray(final int initialCapacity) { - mArray = new SparseArray<Integer>(initialCapacity); + mArray = new SparseArray<>(initialCapacity); } public int size() { |