Merge "Fix layout height for suggestion tile." into pi-dev am: ec9606addb

am: 7eef8156ea Change-Id: Ic4ba2e6fe757648304c90e22eb59b1a4535ef23e
2018-03-08 05:44:39 +00:00
parent 39b2ef235d 7eef8156ea
commit 14abf8d05a
4 changed files with 34 additions and 4 deletions
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -119,7 +119,7 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
        }
        final Icon icon = suggestion.getIcon();
        final Drawable drawable = mCache.getIcon(icon);
-        if (drawable != null) {
+        if (drawable != null && (suggestion.getFlags() & Suggestion.FLAG_ICON_TINTABLE) != 0) {
            drawable.setTint(Utils.getColorAccent(mContext));
        }
        holder.icon.setImageDrawable(drawable);