Cleanup Icon Row custom code.

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuDragHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuDragHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuDragHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuDragHelper.java
index 17f80822069edc390ad643ba8508d83d2e4e2550..0b66a4e1eefaceaa18b30b4e41898579ad05be30 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuDragHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuDragHelper.java
@@ -18,6 +18,8 @@ import android.view.View;
 import android.view.View.OnTouchListener;
 import android.view.ViewConfiguration;
 import android.view.ViewParent;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.ListPopupWindow;
 import android.widget.ListView;
 
@@ -157,16 +159,7 @@ class AppMenuDragHelper {
             assert false;
         }
 
-        if (mAppMenu.isShowingIconRow()) {
-            View iconRowView = mAppMenu.getIconRowView();
-            iconRowView.findViewById(R.id.menu_item_back).setOnTouchListener(
-                    mDragScrollTouchEventForwarder);
-            iconRowView.findViewById(R.id.menu_item_forward).setOnTouchListener(
-                    mDragScrollTouchEventForwarder);
-            iconRowView.findViewById(R.id.menu_item_bookmark).setOnTouchListener(
-                    mDragScrollTouchEventForwarder);
 
-        }
 
         if (!isByHardwareButton && startDragging) mDragScrolling.start();
     }
@@ -262,6 +255,7 @@ class AppMenuDragHelper {
                     break;
                 case MotionEvent.ACTION_UP:
                     itemAction = ITEM_ACTION_PERFORM;
+                    System.out.println("aurimas ACTION UP");

[David Trainor- moved to gerrit, 2014/03/19 07:03:38]

Remove

[aurimas (slooooooooow), 2014/03/19 18:32:53]

Done.

                     break;
                 default:
                     break;
@@ -335,25 +329,21 @@ class AppMenuDragHelper {
 
         ArrayList<View> itemViews = new ArrayList<View>();
         for (int i = 0; i < listView.getChildCount(); ++i) {
-            itemViews.add(listView.getChildAt(i));
-        }
-
-        View iconRowView = mAppMenu.getIconRowView();
-        if (iconRowView != null && mAppMenu.isShowingIconRow()) {
-            itemViews.add(iconRowView.findViewById(R.id.menu_item_back));
-            itemViews.add(iconRowView.findViewById(R.id.menu_item_forward));
-            itemViews.add(iconRowView.findViewById(R.id.menu_item_bookmark));
+            boolean hasImageButtons = false;
+            if (listView.getChildAt(i) instanceof LinearLayout) {
+                LinearLayout layout = (LinearLayout) listView.getChildAt(i);
+                for (int j = 0; j < layout.getChildCount(); ++j) {
+                    itemViews.add(layout.getChildAt(j));
+                    if (layout.getChildAt(j) instanceof ImageButton) hasImageButtons = true;
+                }
+            }
+            if (!hasImageButtons) itemViews.add(listView.getChildAt(i));
         }
 
         boolean didPerformClick = false;
         for (int i = 0; i < itemViews.size(); ++i) {
             View itemView = itemViews.get(i);
 
-            // Skip the icon row that belongs to the listView because that doesn't really
-            // exist as an item.
-            int listViewPositionIndex = listView.getFirstVisiblePosition() + i;
-            if (mAppMenu.isShowingIconRow() && listViewPositionIndex == 0) continue;
-
             boolean shouldPerform = itemView.isEnabled() && itemView.isShown() &&
                     getScreenVisibleRect(itemView).contains(screenX, screenY);
 
@@ -363,11 +353,7 @@ class AppMenuDragHelper {
                     break;
                 case ITEM_ACTION_PERFORM:
                     if (shouldPerform) {
-                        if (itemView.getParent() == listView) {
-                            listView.performItemClick(itemView, listViewPositionIndex, 0);
-                        } else {
-                            itemView.performClick();
-                        }
+                        itemView.performClick();
                         didPerformClick = true;
                     }
                     break;