summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 22:52:45 +0000
committerdtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 22:52:45 +0000
commit7082f13b68aff5491614d8824d843ae75b3def30 (patch)
tree466cd4b207fc21cead3295f41857cc720b5d2ea7
parent40d730a23dc29c2105b476344da1afab8d9a6ec3 (diff)
downloadchromium_src-7082f13b68aff5491614d8824d843ae75b3def30.zip
chromium_src-7082f13b68aff5491614d8824d843ae75b3def30.tar.gz
chromium_src-7082f13b68aff5491614d8824d843ae75b3def30.tar.bz2
Merge 289183 "Android Disable menu animations for low end devices"
> Android Disable menu animations for low end devices > > BUG=403143 > > Review URL: https://codereview.chromium.org/469583003 TBR=dtrainor@chromium.org Review URL: https://codereview.chromium.org/461383003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@289406 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java23
1 files changed, 15 insertions, 8 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java
index 6f7f573..8d5bea3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java
@@ -24,6 +24,7 @@ import android.widget.ListPopupWindow;
import android.widget.PopupWindow;
import android.widget.PopupWindow.OnDismissListener;
+import org.chromium.base.SysUtils;
import org.chromium.chrome.R;
import java.util.ArrayList;
@@ -111,6 +112,9 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
mPopup.setAnimationStyle(R.style.OverflowMenuAnim);
}
+ // Turn off window animations for low end devices.
+ if (SysUtils.isLowEndDevice()) mPopup.setAnimationStyle(0);
+
Rect bgPadding = new Rect();
mPopup.getBackground().getPadding(bgPadding);
@@ -154,14 +158,17 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
mPopup.getListView().setFadingEdgeLength(mVerticalFadeDistance);
}
- mPopup.getListView().addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
- @Override
- public void onLayoutChange(View v, int left, int top, int right, int bottom,
- int oldLeft, int oldTop, int oldRight, int oldBottom) {
- mPopup.getListView().removeOnLayoutChangeListener(this);
- runMenuItemEnterAnimations();
- }
- });
+ // Don't animate the menu items for low end devices.
+ if (!SysUtils.isLowEndDevice()) {
+ mPopup.getListView().addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+ @Override
+ public void onLayoutChange(View v, int left, int top, int right, int bottom,
+ int oldLeft, int oldTop, int oldRight, int oldBottom) {
+ mPopup.getListView().removeOnLayoutChangeListener(this);
+ runMenuItemEnterAnimations();
+ }
+ });
+ }
}
private void setPopupOffset(ListPopupWindow popup, int screenRotation, Rect appRect) {