Fix usage of private APIs in KeyboardShortcutGroupTest
Bug: 62066271
Test: bit CtsViewTestCases:.KeyboardShortcutGroupTest
with LOCAL_SDK_VERSION := test_current in the Android.mk
doesn't show KeyboardShortcutGroupTest errors
Change-Id: I0cfb4330627b0a84bf7ab7a22794e5d0bffbf4a4
diff --git a/tests/tests/view/src/android/view/cts/KeyboardShortcutGroupTest.java b/tests/tests/view/src/android/view/cts/KeyboardShortcutGroupTest.java
index cae49c7..e8e764a 100644
--- a/tests/tests/view/src/android/view/cts/KeyboardShortcutGroupTest.java
+++ b/tests/tests/view/src/android/view/cts/KeyboardShortcutGroupTest.java
@@ -27,11 +27,10 @@
import android.view.KeyboardShortcutGroup;
import android.view.KeyboardShortcutInfo;
-import com.google.android.collect.Lists;
-
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -41,9 +40,14 @@
@RunWith(AndroidJUnit4.class)
public class KeyboardShortcutGroupTest {
private static final CharSequence TEST_LABEL = "Test Group Label";
- private final List<KeyboardShortcutInfo> TEST_ITEMS = Lists.newArrayList(
- new KeyboardShortcutInfo("Item 1", KeyEvent.KEYCODE_U, KeyEvent.META_CTRL_ON),
- new KeyboardShortcutInfo("Item 2", KeyEvent.KEYCODE_F, KeyEvent.META_CTRL_ON));
+ private static final List<KeyboardShortcutInfo> TEST_ITEMS = new ArrayList<>();
+
+ static {
+ TEST_ITEMS.add(new KeyboardShortcutInfo(
+ "Item 1", KeyEvent.KEYCODE_U, KeyEvent.META_CTRL_ON));
+ TEST_ITEMS.add(new KeyboardShortcutInfo(
+ "Item 2", KeyEvent.KEYCODE_F, KeyEvent.META_CTRL_ON));
+ }
@Test
public void testConstructor() {
