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

Merge "Fix bug 5296851 - Silly monkeys."

Browse Source
This commit is contained in:
Adam Powell
2011-09-12 19:19:33 -07:00
committed by Android (Google) Code Review
parent 1667446c90 b844011046
commit 66d46f1db8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/widget/ActionBarView.java
View File

@@ -268,8 +268,10 @@ public class ActionBarView extends AbsActionBarView {
if (mTabScrollView != null && mIncludeTabs) {
ViewGroup.LayoutParams lp = mTabScrollView.getLayoutParams();
lp.width = LayoutParams.WRAP_CONTENT;
lp.height = LayoutParams.MATCH_PARENT;
if (lp != null) {
lp.width = LayoutParams.WRAP_CONTENT;
lp.height = LayoutParams.MATCH_PARENT;
}
mTabScrollView.setAllowCollapse(true);
}
}