Cleanup Icon Row custom code.

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

 // Copyright 2014 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.appmenu;
 
 import android.animation.TimeAnimator;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.os.SystemClock;
 import android.util.Log;
 import android.view.Display;
 import android.view.MotionEvent;
 import android.view.Surface;
 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;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.UmaBridge;
 
 import java.util.ArrayList;
 
 /**
  * Handles the drag touch events on AppMenu that start from the menu button.
@@ skipping 29 matching lines @@
     private int mDragScrollOffsetRounded;
     private volatile float mDragScrollingVelocity;
     private volatile float mLastTouchX;
     private volatile float mLastTouchY;
     private float mTopTouchMovedBound;
     private float mBottomTouchMovedBound;
     private boolean mIsDownScrollable;
     private boolean mIsUpScrollable;
     private boolean mIsByHardwareButton;
     private int mCurrentScreenRotation = -1;
+    private final int mItemRowHeight;
 
     // These are used in a function locally, but defined here to avoid heap allocation on every
     // touch event.
     private final Rect mScreenVisibleRect = new Rect();
     private final int[] mScreenVisiblePoint = new int[2];
 
     // Sub-UI-controls, backward, forward, bookmark and listView, are getting a touch event first
     // if the app menu is initiated by hardware menu button. For those cases, we need to
     // conditionally forward the touch event to our drag scrolling method.
     private final OnTouchListener mDragScrollTouchEventForwarder = new OnTouchListener() {
         @Override
         public boolean onTouch(View view, MotionEvent event) {
             return handleDragging(event);
         }
     };
 
-    AppMenuDragHelper(Activity activity, AppMenu appMenu) {
+    AppMenuDragHelper(Activity activity, AppMenu appMenu, int itemRowHeight) {
         mActivity = activity;
         mAppMenu = appMenu;
+        mItemRowHeight = itemRowHeight;
         mScaledTouchSlop = ViewConfiguration.get(
                 mActivity.getApplicationContext()).getScaledTouchSlop();
         Resources res = mActivity.getResources();
         mAutoScrollFullVelocity = res.getDimensionPixelSize(R.dimen.auto_scroll_full_velocity);
         mEdgeSwipeInSlop = res.getDimensionPixelSize(R.dimen.edge_swipe_in_slop);
         mEdgeSwipeInAdditionalSlop = res.getDimensionPixelSize(
                 R.dimen.edge_swipe_in_additional_slop);
         mEdgeSwipeOutSlop = res.getDimensionPixelSize(R.dimen.edge_swipe_out_slop);
         // If user is dragging and the popup ListView is too big to display at once,
         // mDragScrolling animator scrolls mPopup.getListView() automatically depending on
@@ skipping 55 matching lines @@
 
         // We assume that the parent of popup ListView is an instance of View. Otherwise, dragging
         // from a hardware menu button won't work.
         ViewParent listViewParent = popup.getListView().getParent();
         if (listViewParent instanceof View) {
             ((View) listViewParent).setOnTouchListener(mDragScrollTouchEventForwarder);
         } else {
             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);
 
-        }

[Kibeom Kim (inactive), 2014/03/19 22:04:46]

not sure dragging from hardware menu button would work with this change. My
guess is that, dragging from the bottom could work, but on landscape mode, if
user drags in from hardware menu button to one of these three buttons directly,
might not work.

[Kibeom Kim (inactive), 2014/03/19 22:35:05]

-> discussed with Aurimas, it seems the current hardware menu dragging is not
reliable anyways, so let's just land this.

 
         if (!isByHardwareButton && startDragging) mDragScrolling.start();
     }
 
     void onDismiss() {
         mDragScrolling.cancel();
     }
 
     /**
      * This is a hint for adjusting edgeSwipeInSlop. For example. If the touch event started
@@ skipping 88 matching lines @@
             }
         }
         didPerformClick = menuItemAction(roundedRawX, roundedRawY, itemAction);
 
         if (eventActionMasked == MotionEvent.ACTION_UP && !didPerformClick) {
             mAppMenu.dismiss();
         } else if (eventActionMasked == MotionEvent.ACTION_MOVE) {
             // Auto scrolling on the top or the bottom of the listView.
             if (listView.getHeight() > 0) {
                 float autoScrollAreaRatio = Math.min(AUTO_SCROLL_AREA_MAX_RATIO,
-                        mAppMenu.getItemRowHeight() * 1.2f / listView.getHeight());
+                        mItemRowHeight * 1.2f / listView.getHeight());
                 float normalizedY =
                         (rawY - getScreenVisibleRect(listView).top) / listView.getHeight();
                 if (mIsUpScrollable && normalizedY < autoScrollAreaRatio) {
                     // Top
                     mDragScrollingVelocity = (normalizedY / autoScrollAreaRatio - 1.0f)
                             * mAutoScrollFullVelocity;
                 } else if (mIsDownScrollable && normalizedY > 1.0f - autoScrollAreaRatio) {
                     // Bottom
                     mDragScrollingVelocity = ((normalizedY - 1.0f) / autoScrollAreaRatio + 1.0f)
                             * mAutoScrollFullVelocity;
@@ skipping 39 matching lines @@
      * @param screenX X in screen space coordinate.
      * @param screenY Y in screen space coordinate.
      * @param action  Action type to perform, it should be one of ITEM_ACTION_* constants.
      * @return true whether or not a menu item is performed (executed).
      */
     private boolean menuItemAction(int screenX, int screenY, int action) {
         ListView listView = mAppMenu.getPopup().getListView();
 
         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);
 
             switch (action) {
                 case ITEM_ACTION_HIGHLIGHT:
                     itemView.setPressed(shouldPerform);
                     break;
                 case ITEM_ACTION_PERFORM:
                     if (shouldPerform) {
-                        if (itemView.getParent() == listView) {
-                            listView.performItemClick(itemView, listViewPositionIndex, 0);
-                        } else {
-                            itemView.performClick();
-                        }
+                        itemView.performClick();
                         didPerformClick = true;
                     }
                     break;
                 case ITEM_ACTION_CLEAR_HIGHLIGHT_ALL:
                     itemView.setPressed(false);
                     break;
                 default:
                     assert false;
                     break;
             }
@@ skipping 69 matching lines @@
             // If it's right after we had hardware menu button UP event, use large edgeSwipeInSlop,
             // Otherwise, use small edgeSwipeInSlop.
             float additionalEdgeSwipeInSlop = ((mHardwareMenuButtonUpTime - event.getEventTime()
                     + EDGE_SWIPE_IN_ADDITIONAL_SLOP_TIME_MS) * 0.001f)
                     * mEdgeSwipeInAdditionalSlop;
             edgeSwipeInSlope += Math.max(0.0f, additionalEdgeSwipeInSlop);
         }
         return edgeSwipeInSlope;
     }
 }