Merge "Refactor VideoRender"
diff --git a/tests/tests/provider/src/android/provider/cts/CalendarTest.java b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
index e460453..3c10d0c 100644
--- a/tests/tests/provider/src/android/provider/cts/CalendarTest.java
+++ b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
@@ -1769,15 +1769,34 @@
// Test that inserting a valid color index works
ev = EventHelper.getNewEventValues(account, seed++, cal_id, false);
- ev.put(Events.EVENT_COLOR_KEY, ColorHelper.DEFAULT_INDICES[ColorHelper.E_COLOR_0]);
+ final String defaultColorIndex = ColorHelper.DEFAULT_INDICES[ColorHelper.E_COLOR_0];
+ ev.put(Events.EVENT_COLOR_KEY, defaultColorIndex);
Uri uri = mContentResolver.insert(Events.CONTENT_URI, ev);
long eventId2 = ContentUris.parseId(uri);
assertTrue(eventId2 >= 0);
// And updates the event's color to the one in the table
- ev.put(Events.EVENT_COLOR, ColorHelper.DEFAULT_COLORS[ColorHelper.E_COLOR_0]);
+ final int expectedColor = ColorHelper.DEFAULT_COLORS[ColorHelper.E_COLOR_0];
+ ev.put(Events.EVENT_COLOR, expectedColor);
verifyEvent(ev, eventId2);
+ // Test that event iterator has COLOR columns
+ final EntityIterator iterator = EventsEntity.newEntityIterator(mContentResolver.query(
+ ContentUris.withAppendedId(EventsEntity.CONTENT_URI, eventId2),
+ null, null, null, null), mContentResolver);
+ assertTrue("Empty Iterator", iterator.hasNext());
+ final Entity entity = iterator.next();
+ final ContentValues values = entity.getEntityValues();
+ assertTrue("Missing EVENT_COLOR", values.containsKey(EventsEntity.EVENT_COLOR));
+ assertEquals("Wrong EVENT_COLOR",
+ expectedColor,
+ (int) values.getAsInteger(EventsEntity.EVENT_COLOR));
+ assertTrue("Missing EVENT_COLOR_KEY", values.containsKey(EventsEntity.EVENT_COLOR_KEY));
+ assertEquals("Wrong EVENT_COLOR_KEY",
+ defaultColorIndex,
+ values.getAsString(EventsEntity.EVENT_COLOR_KEY));
+ iterator.close();
+
// Test that updating a valid color index also updates the color in an
// event
ev.clear();
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 46ad087..eff9640 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -1010,7 +1010,7 @@
// focus on first link
handler.reset();
- getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
+ getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_TAB);
mOnUiThread.requestFocusNodeHref(hrefMsg);
new PollingCheck() {
@Override
@@ -1035,7 +1035,7 @@
handler.reset();
final Message hrefMsg2 = new Message();
hrefMsg2.setTarget(handler);
- getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
+ getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_TAB);
mOnUiThread.requestFocusNodeHref(hrefMsg2);
new PollingCheck() {
@Override
@@ -1787,7 +1787,7 @@
private void moveFocusDown() throws Throwable {
// send down key and wait for idle
- sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
+ getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_TAB);
// waiting for idle isn't always sufficient for the key to be fully processed
Thread.sleep(500);
}