Merge "Update Search UX for OC" into oc-dev

2017-04-25 00:55:02 +00:00
parent 6d537b6767 d0b42b0322
commit 0cdade8a78
6 changed files with 8 additions and 9 deletions
--- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
@@ -303,7 +303,7 @@ public class DatabaseIndexingManagerTest {
        // Class Name
        assertThat(cursor.getString(11)).isEqualTo(className);
        // Icon
-        assertThat(cursor.getInt(12)).isEqualTo(iconResId);
+        assertThat(cursor.getInt(12)).isEqualTo(0);
        // Intent Action
        assertThat(cursor.getString(13)).isEqualTo(action);
        // Target Package