PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check for dynamic summaries at display time for search" into oc-dev am: 2046c59b77

Browse Source 
am: 74eda7150b

Change-Id: Id496fc3d44f5103c65aa7b4de8ebcfab54f5de7b
This commit is contained in:
Matthew Fritze
2017-06-06 19:11:26 +00:00
committed by android-build-merger
parent 83e85cadd8 74eda7150b
commit 6ab30cf253
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/search/SearchViewHolder.java
View File

@@ -35,6 +35,8 @@ import com.android.settings.overlay.FeatureFactory;
*/ */
public abstract class SearchViewHolder extends RecyclerView.ViewHolder { public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
private final String DYNAMIC_PLACEHOLDER = "%s";
private final String mPlaceholderSummary; private final String mPlaceholderSummary;
public final TextView titleView; public final TextView titleView;
@@ -63,8 +65,10 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
public void onBind(SearchFragment fragment, SearchResult result) { public void onBind(SearchFragment fragment, SearchResult result) {
titleView.setText(result.title); titleView.setText(result.title);
// TODO (b/36101902) remove check for DYNAMIC_PLACEHOLDER
if (TextUtils.isEmpty(result.summary) 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); summaryView.setVisibility(View.GONE);
} else { } else {
summaryView.setText(result.summary); summaryView.setText(result.summary);

14
tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
View File

@@ -158,6 +158,20 @@ public class IntentSearchViewHolderTest {
assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE); 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) { private SearchResult getSearchResult(String title, String summary, Drawable icon) {
Builder builder = new Builder(); Builder builder = new Builder();
builder.setStableId(Objects.hash(title, summary, icon)) builder.setStableId(Objects.hash(title, summary, icon))