diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 14:08:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 14:08:42 -0700 |
commit | 9951b7c4f094d39db70626ed665f848971220c48 (patch) | |
tree | 5a45ae0f69c77379153a1c7171326d6bf963c855 | |
parent | 88a4292186fef902db476d63529d0b15a17d9d4d (diff) | |
parent | e5c46faefb9deda885cff308ec9b1926636ca8bc (diff) | |
download | frameworks_base-9951b7c4f094d39db70626ed665f848971220c48.zip frameworks_base-9951b7c4f094d39db70626ed665f848971220c48.tar.gz frameworks_base-9951b7c4f094d39db70626ed665f848971220c48.tar.bz2 |
am e5c46fae: am 6d0dd51e: Merge "Return early when checking divider before child zero."
* commit 'e5c46faefb9deda885cff308ec9b1926636ca8bc':
Return early when checking divider before child zero.
-rw-r--r-- | core/java/com/android/internal/view/menu/ActionMenuView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/com/android/internal/view/menu/ActionMenuView.java b/core/java/com/android/internal/view/menu/ActionMenuView.java index 85e23fa..dc4ee3a 100644 --- a/core/java/com/android/internal/view/menu/ActionMenuView.java +++ b/core/java/com/android/internal/view/menu/ActionMenuView.java @@ -531,6 +531,9 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo @Override protected boolean hasDividerBeforeChildAt(int childIndex) { + if (childIndex == 0) { + return false; + } final View childBefore = getChildAt(childIndex - 1); final View child = getChildAt(childIndex); boolean result = false; |