diff --git a/src/com/android/settings/search/SearchViewHolder.java b/src/com/android/settings/search/SearchViewHolder.java index 55fd5943d6a..72fd0232024 100644 --- a/src/com/android/settings/search/SearchViewHolder.java +++ b/src/com/android/settings/search/SearchViewHolder.java @@ -35,6 +35,8 @@ import com.android.settings.overlay.FeatureFactory; */ public abstract class SearchViewHolder extends RecyclerView.ViewHolder { + private final String DYNAMIC_PLACEHOLDER = "%s"; + private final String mPlaceholderSummary; public final TextView titleView; @@ -63,8 +65,10 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder { public void onBind(SearchFragment fragment, SearchResult result) { titleView.setText(result.title); + // TODO (b/36101902) remove check for DYNAMIC_PLACEHOLDER if (TextUtils.isEmpty(result.summary) - || TextUtils.equals(result.summary, mPlaceholderSummary)) { + || TextUtils.equals(result.summary, mPlaceholderSummary) + || TextUtils.equals(result.summary, DYNAMIC_PLACEHOLDER)) { summaryView.setVisibility(View.GONE); } else { summaryView.setText(result.summary); diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java index efeeffcfed5..85ce88b5249 100644 --- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java @@ -158,6 +158,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.setStableId(Objects.hash(title, summary, icon))