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

Author: adamp

core/java/com/android/internal/widget/ActionBarView.java

@@ -847,7 +847,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
         int contentWidth = MeasureSpec.getSize(widthMeasureSpec);
 
-        int maxHeight = mContentHeight > 0 ?
+        int maxHeight = mContentHeight >= 0 ?
                 mContentHeight : MeasureSpec.getSize(heightMeasureSpec);
 
         final int verticalPadding = getPaddingTop() + getPaddingBottom();

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" />