Merge "Only add icons to settings items with icons" into oc-dev am: ec00573139

am: ab13b378c9

Change-Id: I7194c8f3a1e17cc7b44548f97b0eabb51d4f6616

diff --cc src/com/android/settings/search2/DatabaseIndexingManager.java
Simple merge

diff --cc src/com/android/settings/search2/SearchViewHolder.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
index 47e677a,b76feff..5151ca8
--- 1/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
--- 2/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
@@@ -524,12 -513,21 +525,24 @@@ public class DatabaseIndexingManagerTes
          // Payload Type - default is 0
          assertThat(cursor.getInt(19)).isEqualTo(0);
          // Payload - should be updated to real payloads as controllers are added
 -        assertThat(cursor.getBlob(20)).isNull();
 +        byte[] payload = cursor.getBlob(20);
 +        ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(payload,
 +                ResultPayload.CREATOR);
 +        assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
      }
  
+     @Test
+     public void testAddResource_iconAddedFromXml() {
+         SearchIndexableResource resource = getFakeResource(R.xml.connected_devices);
+         mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
+ 
+         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index ORDER BY data_title", null);
+         cursor.moveToPosition(0);
+ 
+         // Icon
+         assertThat(cursor.getInt(12)).isNotEqualTo(noIcon);
+     }
+ 
      // Tests for the flow: IndexOneResource -> IndexFromProvider -> IndexFromResource ->
      //                     UpdateOneRowWithFilteredData -> UpdateOneRow
  

diff --cc tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java
index 41084a5,51cd484..607f293
--- 1/tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java
--- 2/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search2/IntentSearchViewHolderTest.java
@@@ -151,15 -163,15 +159,15 @@@ public class IntentSearchViewHolderTes
          assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
      }
  
-     private SearchResult getSearchResult() {
+     private SearchResult getSearchResult(String title, String summary, Drawable icon) {
          Builder builder = new Builder();
-         builder.addTitle(TITLE)
-                 .addSummary(SUMMARY)
+         builder.addTitle(title)
+                 .addSummary(summary)
                  .addRank(1)
 -                .addPayload(new IntentPayload(
 +                .addPayload(new ResultPayload(
                          new Intent().setComponent(new ComponentName("pkg", "class"))))
                  .addBreadcrumbs(new ArrayList<>())
-                 .addIcon(mIcon);
+                 .addIcon(icon);
  
          return builder.build();
      }