diff options
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarView.java | 2 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index 8ff39d69d8cb..d85e816da135 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -847,7 +847,7 @@ public class ActionBarView extends AbsActionBarView { int contentWidth = MeasureSpec.getSize(widthMeasureSpec); - int maxHeight = mContentHeight > 0 ? + int maxHeight = mContentHeight >= 0 ? mContentHeight : MeasureSpec.getSize(heightMeasureSpec); final int verticalPadding = getPaddingTop() + getPaddingBottom(); diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 6386bcb74f10..5d8d3974c28d 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -5502,6 +5502,7 @@ </attr> <!-- Options affecting how the action bar is displayed. --> <attr name="displayOptions"> + <flag name="none" value="0" /> <flag name="useLogo" value="0x1" /> <flag name="showHome" value="0x2" /> <flag name="homeAsUp" value="0x4" /> |