Merge "Check for dynamic summaries at display time for search" into oc-dev

am: 2046c59b77

Change-Id: I549f1aa455ffbff0119dd00ef782710992100cce

tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java

@@ -163,6 +163,20 @@ public class IntentSearchViewHolderTest {
         assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
     }
 
+    @Test
+    public void testBindElements_dynamicSummary_visibilityIsGone() {
+        String dynamicSummary = "%s";
+        SearchResult result = new Builder()
+                .addTitle(TITLE)
+                .addSummary(dynamicSummary)
+                .addPayload(new IntentPayload(null))
+                .build();
+
+        mHolder.onBind(mFragment, result);
+
+        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
+    }
+
     private SearchResult getSearchResult(String title, String summary, Drawable icon) {
         Builder builder = new Builder();
         builder.addTitle(title)