[Android] Fix overflow menu enter tablet animation

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

 // Copyright 2011 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.Animator;
 import android.animation.AnimatorSet;
 import android.content.Context;
 import android.content.res.Resources;
@@ skipping 28 matching lines @@
 public class AppMenu implements OnItemClickListener, OnKeyListener {
     /** Whether or not to show the software menu button in the menu. */
     private static final boolean SHOW_SW_MENU_BUTTON = true;
 
     private static final float LAST_ITEM_SHOW_FRACTION = 0.5f;
 
     private final Menu mMenu;
     private final int mItemRowHeight;
     private final int mItemDividerHeight;
     private final int mVerticalFadeDistance;
-    private final int mAdditionalVerticalOffset;
+    private final int mNegativeSoftwareVerticalOffset;
     private ListPopupWindow mPopup;
     private AppMenuAdapter mAdapter;
     private AppMenuHandler mHandler;
     private int mCurrentScreenRotation = -1;
     private boolean mIsByHardwareButton;
 
     /**
      * Creates and sets up the App Menu.
      * @param menu Original menu created by the framework.
      * @param itemRowHeight Desired height for each app menu row.
      * @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.
      */
     AppMenu(Menu menu, int itemRowHeight, int itemDividerHeight, AppMenuHandler handler,
             Resources res) {
         mMenu = menu;
 
         mItemRowHeight = itemRowHeight;
         assert mItemRowHeight > 0;
 
         mHandler = handler;
 
         mItemDividerHeight = itemDividerHeight;
         assert mItemDividerHeight >= 0;
 
-        mAdditionalVerticalOffset =
-                res.getDimensionPixelSize(R.dimen.menu_software_vertical_offset);
+        mNegativeSoftwareVerticalOffset =
+                res.getDimensionPixelSize(R.dimen.menu_negative_software_vertical_offset);
         mVerticalFadeDistance = res.getDimensionPixelSize(R.dimen.menu_vertical_fade_distance);
     }
 
     /**
      * Creates and shows the app menu anchored to the specified view.
      *
      * @param context             The context of the AppMenu (ensure the proper theme is set on
      *                            this context).
      * @param anchorView          The anchor {@link View} of the {@link ListPopupWindow}.
      * @param isByHardwareButton  Whether or not hardware button triggered it. (oppose to software
@@ skipping 112 matching lines @@
                     assert false;
                     break;
             }
             popup.setHorizontalOffset(horizontalOffset);
             // The menu is displayed above the anchored view, so shift the menu up by the top
             // padding of the background.
             popup.setVerticalOffset(-paddingRect.bottom);
         } else {
             // The menu is displayed over and below the anchored view, so shift the menu up by the
             // height of the anchor view.
-            popup.setVerticalOffset(mAdditionalVerticalOffset - anchorHeight);
+            popup.setVerticalOffset(-mNegativeSoftwareVerticalOffset - anchorHeight);
         }
     }
 
     /**
      * Handles clicks on the AppMenu popup.
      * @param menuItem The menu item in the popup that was clicked.
      */
     void onItemClick(MenuItem menuItem) {
         if (menuItem.isEnabled()) {
             dismiss();
@@ skipping 104 matching lines @@
                     builder = animation.play((Animator) animatorObject);
                 } else {
                     builder.with((Animator) animatorObject);
                 }
             }
         }
 
         animation.start();
     }
 }