Revert of Make PaymentOption store a Drawable instead of id

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments.ui;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.TextUtils.TruncateAt;
 import android.text.style.StyleSpan;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ skipping 107 matching lines @@
     private final int mFocusedBackgroundColor;
     private final LinearLayout mMainSection;
     private final ImageView mLogoView;
     private final ImageView mChevronView;
 
     private TextView mTitleView;
     private LinearLayout mSummaryLayout;
     private TextView mSummaryLeftTextView;
     private TextView mSummaryRightTextView;
 
-    private Drawable mLogo;
+    private int mLogoResourceId;
     private boolean mIsSummaryAllowed = true;
 
     /**
      * Constructs a PaymentRequestSection.
      *
      * @param context     Context to pull resources from.
      * @param sectionName Title of the section to display.
      * @param delegate    Delegate to alert when something changes in the dialog.
      */
     private PaymentRequestSection(Context context, String sectionName, SectionDelegate delegate) {
@@ skipping 17 matching lines @@
         mLogoView = isLogoNecessary() ? createAndAddLogoView(this, 0, mLargeSpacing) : null;
         mEditButtonView = createAndAddEditButton(this);
         mChevronView = createAndAddChevron(this);
         mIsLayoutInitialized = true;
         setDisplayMode(DISPLAY_MODE_NORMAL);
     }
 
     /**
      * Sets what logo should be displayed.
      *
-     * @param resource The logo to display.
+     * @param resourceId ID of the logo to display.
      */
-    protected void setLogoDrawable(Drawable logo) {
+    protected void setLogoResource(int resourceId) {
         assert isLogoNecessary();
-        mLogo = logo;
-        mLogoView.setImageDrawable(mLogo);
+        mLogoResourceId = resourceId;
+        mLogoView.setImageResource(resourceId);
     }
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent event) {
         // Allow touches to propagate to children only if the layout can be interacted with.
         return !mDelegate.isAcceptingUserInput();
     }
 
     @Override
     public final void onClick(View v) {
@@ skipping 212 matching lines @@
      */
     protected void updateControlLayout() {
         if (!mIsLayoutInitialized) return;
 
         boolean isExpanded =
                 mDisplayMode == DISPLAY_MODE_FOCUSED || mDisplayMode == DISPLAY_MODE_CHECKING;
         setBackgroundColor(isExpanded ? mFocusedBackgroundColor : Color.WHITE);
 
         // Update whether the logo is displayed.
         if (mLogoView != null) {
-            boolean show = mLogo != null && mDisplayMode != DISPLAY_MODE_FOCUSED;
+            boolean show = mLogoResourceId != 0 && mDisplayMode != DISPLAY_MODE_FOCUSED;
             mLogoView.setVisibility(show ? VISIBLE : GONE);
         }
 
         // The button takes precedence over the summary text and the chevron.
         int editButtonState = getEditButtonState();
         if (editButtonState == EDIT_BUTTON_GONE) {
             mEditButtonView.setVisibility(GONE);
             mChevronView.setVisibility(
                     mDisplayMode == DISPLAY_MODE_EXPANDABLE ? VISIBLE : GONE);
 
@@ skipping 286 matching lines @@
             private static final int OPTION_ROW_TYPE_WARNING = 3;
 
             private final int mRowType;
             private final PaymentOption mOption;
             private final View mButton;
             private final TextView mLabel;
             private final View mIcon;
 
             public OptionRow(GridLayout parent, int rowIndex, int rowType, PaymentOption item,
                     boolean isSelected) {
-                boolean iconExists = item != null && item.getDrawableIcon() != null;
+                boolean iconExists = item != null && item.getDrawableIconId() != 0;
                 boolean isEnabled = item != null && item.isValid();
                 mRowType = rowType;
                 mOption = item;
                 mButton = createButton(parent, rowIndex, isSelected, isEnabled);
                 mLabel = createLabel(parent, rowIndex, iconExists, isEnabled);
                 mIcon = iconExists ? createIcon(parent, rowIndex) : null;
             }
 
             /** Sets the selected state of this item, alerting the delegate if selected. */
             public void setChecked(boolean isChecked) {
@@ skipping 132 matching lines @@
 
                 labelView.setOnClickListener(OptionSection.this);
                 return labelView;
             }
 
             private View createIcon(GridLayout parent, int rowIndex) {
                 // The icon has a pre-defined width.
                 ImageView icon = new ImageView(parent.getContext());
                 icon.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
                 icon.setBackgroundResource(R.drawable.payments_ui_logo_bg);
-                icon.setImageDrawable(mOption.getDrawableIcon());
+                icon.setImageResource(mOption.getDrawableIconId());
                 icon.setMaxWidth(mIconMaxWidth);
 
                 // The icon floats to the right of everything.
                 GridLayout.LayoutParams iconParams = new GridLayout.LayoutParams(
                         GridLayout.spec(rowIndex, 1, GridLayout.CENTER), GridLayout.spec(2, 1));
                 iconParams.topMargin = mVerticalMargin;
                 ApiCompatibilityUtils.setMarginStart(iconParams, mLargeSpacing);
                 parent.addView(icon, iconParams);
 
                 icon.setOnClickListener(OptionSection.this);
@@ skipping 161 matching lines @@
             } else if (mSectionInformation.getSelectedItem() == null) {
                 // The user hasn't selected any available PaymentOptions.  Ask the user to pick one.
                 return EDIT_BUTTON_SELECT;
             } else {
                 return EDIT_BUTTON_GONE;
             }
         }
 
         private void updateSelectedItem(PaymentOption selectedItem) {
             if (selectedItem == null) {
-                setLogoDrawable(null);
+                setLogoResource(0);
                 setIsSummaryAllowed(false);
                 setSummaryText(null, null);
             } else {
-                setLogoDrawable(selectedItem.getDrawableIcon());
+                setLogoResource(selectedItem.getDrawableIconId());
                 setSummaryText(convertOptionToString(selectedItem, false), null);
             }
 
             updateControlLayout();
         }
 
         private void updateOptionList(SectionInformation information, PaymentOption selectedItem) {
             mOptionLayout.removeAllViews();
             mOptionRows.clear();
             mLabelsForTest.clear();
@@ skipping 111 matching lines @@
         }
 
         /** Expand the separator to be the full width of the dialog. */
         public void expand() {
             LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) getLayoutParams();
             ApiCompatibilityUtils.setMarginStart(params, 0);
             ApiCompatibilityUtils.setMarginEnd(params, 0);
         }
     }
 }