Remove bottom AppMenu list items translation animation

+ Set list item translation value to 0 when app menu is anchored
  at bottom

Before: Bottom AppMenu list items translate y position while fade in
Now: List items don't translate y position while fade in when
     app menu is at bottom, but still translate when at top.

BUG=735272

Change-Id: I0f20647807916059c7c81613772f5881c85600da
Reviewed-on: https://chromium-review.googlesource.com/566588Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486803}

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

@@ -63,6 +63,7 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
     private final int mVerticalFadeDistance;
     private final int mNegativeSoftwareVerticalOffset;
     private final int[] mTempLocation;
+    private final boolean mTranslateMenuItemsOnShow;
 
     private PopupWindow mPopup;
     private ListView mListView;
@@ -82,9 +83,11 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
      * @param itemDividerHeight Desired height for the divider between app menu items.
      * @param handler AppMenuHandler receives callbacks from AppMenu.
      * @param res Resources object used to get dimensions and style attributes.
+     * @param translateMenuItemsOnShow Whether menu items should be translated during the animation
+     *                                 that is run when the menu is shown.
      */
     AppMenu(Menu menu, int itemRowHeight, int itemDividerHeight, AppMenuHandler handler,
-            Resources res) {
+            Resources res, boolean translateMenuItemsOnShow) {
         mMenu = menu;
 
         mItemRowHeight = itemRowHeight;
@@ -100,6 +103,7 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
         mVerticalFadeDistance = res.getDimensionPixelSize(R.dimen.menu_vertical_fade_distance);
 
         mTempLocation = new int[2];
+        mTranslateMenuItemsOnShow = translateMenuItemsOnShow;
     }
 
     /**
@@ -237,8 +241,8 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
 
         // A List adapter for visible items in the Menu. The first row is added as a header to the
         // list view.
-        mAdapter = new AppMenuAdapter(
-                this, menuItems, LayoutInflater.from(context), highlightedItemId);
+        mAdapter = new AppMenuAdapter(this, menuItems, LayoutInflater.from(context),
+                highlightedItemId, mTranslateMenuItemsOnShow);
 
         ViewGroup contentView =
                 (ViewGroup) LayoutInflater.from(context).inflate(R.layout.app_menu_layout, null);

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

@@ -103,6 +103,7 @@ class AppMenuAdapter extends BaseAdapter {
     private final int mNumMenuItems;
     private final Integer mHighlightedItemId;
     private final float mDpToPx;
+    private final boolean mTranslateMenuItemsOnShow;
 
     // Use a single PulseDrawable to spawn the other drawables so that the ConstantState gets
     // shared.  This allows the animation to stay in step even as the views are recycled and the
@@ -111,12 +112,13 @@ class AppMenuAdapter extends BaseAdapter {
     private PulseDrawable mHighlightDrawableSource;
 
     public AppMenuAdapter(AppMenu appMenu, List<MenuItem> menuItems, LayoutInflater inflater,
-            Integer highlightedItemId) {
+            Integer highlightedItemId, boolean translateMenuItemsOnShow) {
         mAppMenu = appMenu;
         mMenuItems = menuItems;
         mInflater = inflater;
         mHighlightedItemId = highlightedItemId;
         mNumMenuItems = menuItems.size();
+        mTranslateMenuItemsOnShow = translateMenuItemsOnShow;
         mDpToPx = inflater.getContext().getResources().getDisplayMetrics().density;
     }
 
@@ -376,15 +378,18 @@ class AppMenuAdapter extends BaseAdapter {
      * @return         The {@link Animator}.
      */
     private Animator buildStandardItemEnterAnimator(final View view, int position) {
-        final float offsetYPx = ENTER_STANDARD_ITEM_OFFSET_Y_DP * mDpToPx;
         final int startDelay = ENTER_ITEM_BASE_DELAY_MS + ENTER_ITEM_ADDL_DELAY_MS * position;
 
         AnimatorSet animation = new AnimatorSet();
-        animation.playTogether(
-                ObjectAnimator.ofFloat(view, View.ALPHA, 0.f, 1.f),
-                ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, offsetYPx, 0.f));
+        if (mTranslateMenuItemsOnShow) {
+            final float offsetYPx = ENTER_STANDARD_ITEM_OFFSET_Y_DP * mDpToPx;
+            animation.playTogether(ObjectAnimator.ofFloat(view, View.ALPHA, 0.f, 1.f),
+                    ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, offsetYPx, 0.f));
+            animation.setStartDelay(startDelay);
+        } else {
+            animation.playTogether(ObjectAnimator.ofFloat(view, View.ALPHA, 0.f, 1.f));
+        }
         animation.setDuration(ENTER_ITEM_DURATION_MS);
-        animation.setStartDelay(startDelay);
         animation.setInterpolator(BakedBezierInterpolator.FADE_IN_CURVE);
 
         animation.addListener(new AnimatorListenerAdapter() {

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

@@ -18,6 +18,7 @@ import android.widget.PopupMenu;
 
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeActivity;
 
 import java.util.ArrayList;
 
@@ -139,8 +140,10 @@ public class AppMenuHandler {
             Drawable itemDivider = a.getDrawable(1);
             int itemDividerHeight = itemDivider != null ? itemDivider.getIntrinsicHeight() : 0;
             a.recycle();
+            boolean translateMenuItemsOnShow = !(mActivity instanceof ChromeActivity)
+                    || ((ChromeActivity) mActivity).getBottomSheet() == null;
             mAppMenu = new AppMenu(mMenu, itemRowHeight, itemDividerHeight, this,
-                    mActivity.getResources());
+                    mActivity.getResources(), translateMenuItemsOnShow);
             mAppMenuDragHelper = new AppMenuDragHelper(mActivity, mAppMenu, itemRowHeight);
         }