Fix (another) measurement issue in ActionBarContainer

Or, the patch in which we discover how many silly bugs adamp caused in
e77b6590.

Change-Id: Iaacd3792d161e068dee74b897872e9ab2f155aca
This commit is contained in:
Adam Powell
2014-08-22 13:57:43 -07:00
parent a12aaa75df
commit 2b7ff72683

View File

@@ -276,8 +276,8 @@ public class ActionBarContainer extends FrameLayout {
continue;
}
final LayoutParams lp = (LayoutParams) child.getLayoutParams();
nonTabMaxHeight = isCollapsed(child) ? 0 :
child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin;
nonTabMaxHeight = Math.max(nonTabMaxHeight, isCollapsed(child) ? 0 :
child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin);
}
if (mTabContainer != null && mTabContainer.getVisibility() != GONE) {