Index: ui/android/java/src/org/chromium/ui/DropdownAdapter.java |
diff --git a/ui/android/java/src/org/chromium/ui/DropdownAdapter.java b/ui/android/java/src/org/chromium/ui/DropdownAdapter.java |
index 2a5a6e3c50eca193e00dd67c28875e420ba87775..92a7f57dfdeb68d40dba3733f6a7c387a5d3a2b4 100644 |
--- a/ui/android/java/src/org/chromium/ui/DropdownAdapter.java |
+++ b/ui/android/java/src/org/chromium/ui/DropdownAdapter.java |
@@ -7,6 +7,7 @@ package org.chromium.ui; |
import android.content.Context; |
import android.graphics.Color; |
import android.graphics.Typeface; |
+import android.support.graphics.drawable.VectorDrawableCompat; |
import android.text.TextUtils; |
import android.util.TypedValue; |
import android.view.LayoutInflater; |
@@ -172,10 +173,11 @@ public class DropdownAdapter extends ArrayAdapter<DropdownItem> { |
} |
ImageView iconView = item.isIconAtStart() ? iconViewStart : iconViewEnd; |
- if (item.getIconId() == DropdownItem.NO_ICON) { |
+ if (item.getVectorDrawableIconId() == DropdownItem.NO_ICON) { |
iconView.setVisibility(View.GONE); |
} else { |
- iconView.setImageResource(item.getIconId()); |
+ iconView.setImageDrawable(VectorDrawableCompat.create(mContext.getResources(), |
Ted C
2017/01/03 19:03:38
I don't think this was a safe change to make.
In
csashi
2017/01/03 19:32:09
I switched all the resources Autofill uses to vect
|
+ item.getVectorDrawableIconId(), mContext.getTheme())); |
iconView.setVisibility(View.VISIBLE); |
} |