Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev

Browse Source
This commit is contained in:
Adam Powell
2014-08-22 21:20:22 +00:00
committed by Android (Google) Code Review
parent acb570cd84 2b7ff72683
commit c9991c7149
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/widget/ActionBarContainer.java
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) {