Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1170)

Unified Diff: ui/android/java/src/org/chromium/ui/DropdownAdapter.java

Issue 2616503002: Support all drawable types in DropdownItem. (Closed)
Patch Set: Fix AutofillKeyboardAccessory Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 92a7f57dfdeb68d40dba3733f6a7c387a5d3a2b4..ce74633ee7f54225aa6b82436ec8f04c7dd1930a 100644
--- a/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
+++ b/ui/android/java/src/org/chromium/ui/DropdownAdapter.java
@@ -7,7 +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.support.v7.content.res.AppCompatResources;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.LayoutInflater;
@@ -173,11 +173,10 @@ public class DropdownAdapter extends ArrayAdapter<DropdownItem> {
}
ImageView iconView = item.isIconAtStart() ? iconViewStart : iconViewEnd;
- if (item.getVectorDrawableIconId() == DropdownItem.NO_ICON) {
+ if (item.getIconId() == DropdownItem.NO_ICON) {
iconView.setVisibility(View.GONE);
} else {
- iconView.setImageDrawable(VectorDrawableCompat.create(mContext.getResources(),
- item.getVectorDrawableIconId(), mContext.getTheme()));
+ iconView.setImageDrawable(AppCompatResources.getDrawable(mContext, item.getIconId()));
iconView.setVisibility(View.VISIBLE);
}

Powered by Google App Engine
This is Rietveld 408576698