aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-05-23 16:44:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-23 16:44:51 +0000
commit3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c (patch)
tree0ceda5aefb24fa3ffa8e52e3d1f8a8757f27296e /tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
parentcf4884c5a79e9260a82e7d4ed0eac264f987c230 (diff)
parent6726bc90014c8d9c1710e4b52aa019d3e945f407 (diff)
downloadlatinime-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 'tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java')
-rw-r--r--tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
index 75bd60999..1ccb58c0f 100644
--- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
+++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java
@@ -32,7 +32,6 @@ import com.android.inputmethod.latin.Constants;
import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.RichInputMethodManager;
import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
-import com.android.inputmethod.latin.utils.CollectionUtils;
import com.android.inputmethod.latin.utils.ResourceUtils;
import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
@@ -42,11 +41,9 @@ import java.util.Locale;
@SmallTest
public class KeyboardLayoutSetTestsBase extends AndroidTestCase {
// All input method subtypes of LatinIME.
- private final ArrayList<InputMethodSubtype> mAllSubtypesList = CollectionUtils.newArrayList();
- private final ArrayList<InputMethodSubtype> mAsciiCapableSubtypesList =
- CollectionUtils.newArrayList();
- private final ArrayList<InputMethodSubtype> mAdditionalSubtypesList =
- CollectionUtils.newArrayList();
+ private final ArrayList<InputMethodSubtype> mAllSubtypesList = new ArrayList<>();
+ private final ArrayList<InputMethodSubtype> mAsciiCapableSubtypesList = new ArrayList<>();
+ private final ArrayList<InputMethodSubtype> mAdditionalSubtypesList = new ArrayList<>();
private Context mThemeContext;
private int mScreenMetrics;