From 187d05201ceac905078a67f547be37c9084947d7 Mon Sep 17 00:00:00 2001
From: SergeyZhukovsky <serg.zhukovsky@gmail.com>
Date: Mon, 3 Feb 2020 22:42:41 -0500
Subject: [PATCH] fixes Android brave shields after chromium 80 rebase

---
 .../appmenu/BraveShieldsMenuAdapter.java      | 25 ++-----------------
 .../appmenu/BraveShieldsMenuHandler.java      |  2 +-
 android/java/res/values/brave_ids.xml         |  5 ++++
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java b/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java
index 9bc0f9d5484..51253b91ad4 100644
--- a/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java
+++ b/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java
@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettin
 //import org.chromium.chrome.browser.MixPanelWorker;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.interpolators.BakedBezierInterpolator;
-import org.chromium.ui.widget.ChromeImageView;
 
 import java.util.List;
 import java.lang.NumberFormatException;
@@ -266,7 +265,7 @@ class BraveShieldsMenuAdapter extends BaseAdapter {
                         number.setTag(R.string.brave_shields_scripts_blocked);
                     }
                 } else if (6 == position) {
-//                    convertView = mInflater.inflate(R.layout.brave_shields_menu_item, parent, false);
+                    convertView = mInflater.inflate(R.layout.brave_shields_menu_item, parent, false);
                     TextView text = (TextView) convertView.findViewById(R.id.brave_shields_text);
                     if (text != null) {
                         text.setText(R.string.brave_shields_fingerprint_methods);
@@ -311,14 +310,7 @@ class BraveShieldsMenuAdapter extends BaseAdapter {
                         String value = text.getText().toString().replaceFirst(" ", "\n");
                         text.setText(value);
                     }*/
-                } else {
-//                    convertView = mInflater.inflate(R.layout.menu_item, parent, false);
-                    holder.text = (TextView) convertView.findViewById(R.id.menu_item_text);
-                    //holder.image = (AppMenuItemIcon) convertView.findViewById(R.id.menu_item_icon);
-                    convertView.setTag(holder);
                 }
-//                convertView.setTag(R.id.menu_item_enter_anim_id,
-//                        buildStandardItemEnterAnimator(convertView, position));
 
                 mPositionViews.append(position, convertView);
             } else {
@@ -328,7 +320,7 @@ class BraveShieldsMenuAdapter extends BaseAdapter {
                 }
             }
 
-            if (null != holder.text && null != holder.image) {
+            if (null != holder.text) {
                 setupStandardMenuItemViewHolder(holder, convertView, item);
             }
         } else {
@@ -628,11 +620,6 @@ class BraveShieldsMenuAdapter extends BaseAdapter {
 
     private void setupStandardMenuItemViewHolder(StandardMenuItemViewHolder holder,
             View convertView, final MenuItem item) {
-        // Set up the icon.
-        Drawable icon = item.getIcon();
-        holder.image.setImageDrawable(icon);
-        holder.image.setVisibility(icon == null ? View.GONE : View.VISIBLE);
-//        holder.image.setChecked(item.isChecked());
         holder.text.setText(item.getTitle());
         holder.text.setContentDescription(item.getTitleCondensed());
 
@@ -641,13 +628,6 @@ class BraveShieldsMenuAdapter extends BaseAdapter {
         holder.text.setEnabled(isEnabled);
         // This will ensure that the item is not highlighted when selected.
         convertView.setEnabled(isEnabled);
-
-        /*convertView.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mAppMenu.onItemClick(item);
-            }
-        });*/
     }
 
     /**
@@ -726,7 +706,6 @@ class BraveShieldsMenuAdapter extends BaseAdapter {
 
     static class StandardMenuItemViewHolder {
         public TextView text;
-        public /*AppMenuItemIcon*/ChromeImageView image;
     }
 
     static class CustomMenuItemViewHolder extends StandardMenuItemViewHolder {
diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuHandler.java b/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuHandler.java
index 2f2d8bfc829..1f1acb2c1d4 100644
--- a/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuHandler.java
+++ b/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuHandler.java
@@ -265,7 +265,7 @@ public class BraveShieldsMenuHandler {
         ViewGroup list = mPopup.getListView();
         for (int i = 0; i < list.getChildCount(); i++) {
             View view = list.getChildAt(i);
-            Object animatorObject = null;/* = view.getTag(R.id.menu_item_enter_anim_id);*/
+            Object animatorObject = view.getTag(R.id.menu_item_enter_anim_id);
             if (animatorObject != null) {
                 if (builder == null) {
                     builder = mMenuItemEnterAnimator.play((Animator) animatorObject);
diff --git a/android/java/res/values/brave_ids.xml b/android/java/res/values/brave_ids.xml
index 421162fd2f0..b06f3311a89 100644
--- a/android/java/res/values/brave_ids.xml
+++ b/android/java/res/values/brave_ids.xml
@@ -8,4 +8,9 @@
     <item name="set_default_browser" type="id"/>
     <item name="brave_rewards_id" type="id"/>
     <item name="exit_id" type="id"/>
+
+    <!-- App menu item custom tags -->
+    <item type="id" name="menu_item_enter_anim_id" />
+    <item type="id" name="menu_item_original_background" />
+    <item type="id" name="menu_item_background_drawable_position" />
 </resources>