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

Merge "Make ActionBar fail more cleanly when invalid heights are set" into jb-mr1-dev

Browse Source
This commit is contained in:
Adam Powell
2012-08-06 17:04:24 -07:00
committed by Android (Google) Code Review
parent baa63509f5 570470a332
commit ecbbfdd3bf
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -847,7 +847,7 @@ public class ActionBarView extends AbsActionBarView {
int contentWidth = MeasureSpec.getSize(widthMeasureSpec); int contentWidth = MeasureSpec.getSize(widthMeasureSpec);
int maxHeight = mContentHeight > 0 ? int maxHeight = mContentHeight >= 0 ?
mContentHeight : MeasureSpec.getSize(heightMeasureSpec); mContentHeight : MeasureSpec.getSize(heightMeasureSpec);
final int verticalPadding = getPaddingTop() + getPaddingBottom(); final int verticalPadding = getPaddingTop() + getPaddingBottom();

1
core/res/res/values/attrs.xml
View File

@@ -5502,6 +5502,7 @@
</attr> </attr>
<!-- Options affecting how the action bar is displayed. --> <!-- Options affecting how the action bar is displayed. -->
<attr name="displayOptions"> <attr name="displayOptions">
<flag name="none" value="0" />
<flag name="useLogo" value="0x1" /> <flag name="useLogo" value="0x1" />
<flag name="showHome" value="0x2" /> <flag name="showHome" value="0x2" />
<flag name="homeAsUp" value="0x4" /> <flag name="homeAsUp" value="0x4" />