Add a missing condition when checking measurement for ActionBarContainer

It even said "non-tab" right there.

Bug 17202141

Change-Id: Iacc7ec9610d2639aab59dd57ba7194178fb6391f
This commit is contained in:
Adam Powell
2014-08-22 10:46:55 -07:00
parent 13c3d9622f
commit a12aaa75df

View File

@@ -272,6 +272,9 @@ public class ActionBarContainer extends FrameLayout {
final int childCount = getChildCount();
for (int i = 0; i < childCount; i++) {
final View child = getChildAt(i);
if (child == mTabContainer) {
continue;
}
final LayoutParams lp = (LayoutParams) child.getLayoutParams();
nonTabMaxHeight = isCollapsed(child) ? 0 :
child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin;