Revert "Clean up use of explicit suggestion tint colors."

This reverts commit 86a3bbcd.

Reason for revert: talked with jpor@ more about this. Looks like
miscommunication regarding what a 'disabled' element is;
jpor@ clarified he meant 'non-interactive' elements, which is a
secondary color tint for icons. we don't have this explicitly available, so may need to address this separately.

the cl that cleans up color definitions is in flight (https://crrev.com/c/2031754), hopefully will land soon. meanwhile
let's revert this for M81 branch

Original change's description:
> Clean up use of explicit suggestion tint colors.
>
> Synced with jpor@ to learn why these colors are different and what
> these should be. Apparently these colors are intended to be the
> "disabled" color values, which was not immediately obvious.
>
> Bug: 1028397
> Change-Id: I20a0f8b9fe3f23dcaf9335961ec89ed411f2caad
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2021330
> Commit-Queue: Ender <ender@google.com>
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#735523}

TBR=tedchoc@chromium.org,ender@google.com

Bug: 1028397
Change-Id: I41b6161549a8cc908aa0b75a0a2e1b6d53bfc2ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033756Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Ender <ender@google.com>
Commit-Queue: Ender <ender@google.com>
Cr-Commit-Position: refs/heads/master@{#737515}

chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinder.java

@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.omnibox.suggestions.base;
 
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
+import android.support.annotation.ColorRes;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.content.res.AppCompatResources;
 import android.view.View;
@@ -92,7 +93,11 @@ public final class BaseSuggestionViewBinder<T extends View>
             rciv.setRoundedCorners(radius, radius, radius, radius);
         }
 
-        updateIcon(rciv, sds, !isDarkMode(model));
+        @ColorRes
+        int tint = isDarkMode(model) ? R.color.default_icon_color_secondary_list
+                                     : R.color.white_mode_tint;
+
+        updateIcon(rciv, sds, tint);
     }
 
     /** Update attributes of decorated suggestion icon. */
@@ -100,7 +105,7 @@ public final class BaseSuggestionViewBinder<T extends View>
             PropertyModel model, BaseSuggestionView<T> baseView) {
         final ImageView view = baseView.getActionImageView();
         final SuggestionDrawableState sds = model.get(BaseSuggestionViewProperties.ACTION_ICON);
-        updateIcon(view, sds, !isDarkMode(model));
+        updateIcon(view, sds, ChromeColors.getIconTintRes(!isDarkMode(model)));
     }
 
     /**
@@ -125,7 +130,7 @@ public final class BaseSuggestionViewBinder<T extends View>
 
     /** Update image view using supplied drawable state object. */
     private static void updateIcon(
-            ImageView view, SuggestionDrawableState sds, boolean useDarkColors) {
+            ImageView view, SuggestionDrawableState sds, @ColorRes int tintRes) {
         final Resources res = view.getContext().getResources();
 
         view.setVisibility(sds == null ? View.GONE : View.VISIBLE);
@@ -137,8 +142,7 @@ public final class BaseSuggestionViewBinder<T extends View>
 
         ColorStateList tint = null;
         if (sds.allowTint) {
-            tint = AppCompatResources.getColorStateList(
-                    view.getContext(), ChromeColors.getIconTintRes(useDarkColors));
+            tint = AppCompatResources.getColorStateList(view.getContext(), tintRes);
         }
 
         view.setImageDrawable(sds.drawable);

chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/DecoratedSuggestionView.java

@@ -35,7 +35,6 @@ class DecoratedSuggestionView<T extends View> extends SimpleHorizontalLayoutView
 
         mSuggestionIcon = new RoundedCornerImageView(getContext());
         mSuggestionIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
-        mSuggestionIcon.setEnabled(false);
 
         mSuggestionIcon.setLayoutParams(new LayoutParams(
                 getResources().getDimensionPixelSize(R.dimen.omnibox_suggestion_icon_area_size),

chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor.java

@@ -10,6 +10,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 
 import androidx.annotation.IntDef;
 
@@ -140,13 +141,10 @@ public class EditUrlSuggestionProcessor implements OnClickListener, SuggestionPr
      * @param context An Android context.
      * @return An edit-URL suggestion view.
      */
-    public static View createView(Context context) {
-        View view = LayoutInflater.from(context).inflate(R.layout.edit_url_suggestion_layout, null);
-        // Note: ImageView does not support android:enabled attribute, and the (disabled) state is
-        // used to drive tint color selection.
-        view.findViewById(R.id.edit_url_favicon).setEnabled(false);
-
-        return view;
+    public static ViewGroup createView(Context context) {
+        LayoutInflater inflater =
+                (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        return (ViewGroup) inflater.inflate(R.layout.edit_url_suggestion_layout, null);
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionViewBinder.java

@@ -4,24 +4,23 @@
 
 package org.chromium.chrome.browser.omnibox.suggestions.editurl;
 
-import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.content.res.AppCompatResources;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.omnibox.suggestions.SuggestionCommonProperties;
-import org.chromium.components.browser_ui.styles.ChromeColors;
 import org.chromium.ui.modelutil.PropertyKey;
 import org.chromium.ui.modelutil.PropertyModel;
 
 /** A mechanism for binding the {@link EditUrlSuggestionProperties} to its view. */
 public class EditUrlSuggestionViewBinder {
-    public static void bind(PropertyModel model, View view, PropertyKey propertyKey) {
+    public static void bind(PropertyModel model, ViewGroup view, PropertyKey propertyKey) {
         if (EditUrlSuggestionProperties.TITLE_TEXT == propertyKey) {
             TextView titleView = view.findViewById(R.id.title_text_view);
             titleView.setText(model.get(EditUrlSuggestionProperties.TITLE_TEXT));
@@ -60,15 +59,15 @@ public class EditUrlSuggestionViewBinder {
         Bitmap bitmap = model.get(EditUrlSuggestionProperties.SITE_FAVICON);
         if (bitmap != null) {
             view.setImageBitmap(bitmap);
-            ApiCompatibilityUtils.setImageTintList(view, null);
         } else {
             boolean useDarkColors = model.get(SuggestionCommonProperties.USE_DARK_COLORS);
             Drawable icon =
                     AppCompatResources.getDrawable(view.getContext(), R.drawable.ic_globe_24dp);
-            ColorStateList tint = AppCompatResources.getColorStateList(
-                    view.getContext(), ChromeColors.getIconTintRes(!useDarkColors));
+            int color = view.getContext().getResources().getColor(useDarkColors
+                            ? R.color.default_icon_color_secondary_list
+                            : R.color.white_mode_tint);
+            DrawableCompat.setTint(icon, color);
             view.setImageDrawable(icon);
-            ApiCompatibilityUtils.setImageTintList(view, tint);
         }
     }
 }