summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorChris Banes <chrisbanes@google.com>2014-10-30 08:42:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-30 08:42:37 +0000
commite436cb39da5ebd57b0ca072ba39bfbe52b0a75e7 (patch)
treecfa294f0f8320fc819912b7b9f64399966da24e3 /core/java/android
parentce34c6d308629c214ab9b7963755eb60cac03c9d (diff)
parent1970cfd4ef97a5a1b5dc385b114d615d858c359b (diff)
downloadframeworks_base-e436cb39da5ebd57b0ca072ba39bfbe52b0a75e7.zip
frameworks_base-e436cb39da5ebd57b0ca072ba39bfbe52b0a75e7.tar.gz
frameworks_base-e436cb39da5ebd57b0ca072ba39bfbe52b0a75e7.tar.bz2
Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/widget/ActionMenuView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/ActionMenuView.java b/core/java/android/widget/ActionMenuView.java
index 7198e52..0a8a01f 100644
--- a/core/java/android/widget/ActionMenuView.java
+++ b/core/java/android/widget/ActionMenuView.java
@@ -429,7 +429,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
}
final int childCount = getChildCount();
- final int midVertical = (top + bottom) / 2;
+ final int midVertical = (bottom - top) / 2;
final int dividerWidth = getDividerWidth();
int overflowWidth = 0;
int nonOverflowWidth = 0;