Merge "Update Search UX for OC" into oc-dev am: 0cdade8a78

am: 61255c0c93 Change-Id: I87d9dc74413d8ba34f7ab72dc047f1b29485e74a
2017-04-25 01:02:03 +00:00
parent a705701cdc 61255c0c93
commit 10ad029318
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
@@ -306,7 +306,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