Merge "Block inline-results from Settings search" into oc-dr1-dev am: bea9a5d739

am: eeec8eecc0

Change-Id: I8094a44c26f0c9d457c1df7d67b6ee0e0fa672ab
This commit is contained in:
Matthew Fritze
2017-06-21 18:03:00 +00:00
committed by android-build-merger
3 changed files with 21 additions and 20 deletions

View File

@@ -106,8 +106,10 @@ public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder>
view = inflater.inflate(R.layout.search_intent_item, parent, false);
return new IntentSearchViewHolder(view);
case ResultPayload.PayloadType.INLINE_SWITCH:
view = inflater.inflate(R.layout.search_inline_switch_item, parent, false);
return new InlineSwitchViewHolder(view, context);
// TODO (b/62807132) replace layout InlineSwitchViewHolder and return an
// InlineSwitchViewHolder.
view = inflater.inflate(R.layout.search_intent_item, parent, false);
return new IntentSearchViewHolder(view);
case ResultPayload.PayloadType.SAVED_QUERY:
view = inflater.inflate(R.layout.search_saved_query_item, parent, false);
return new SavedQueryViewHolder(view);