From 570470a332a824a66c74a1d6bd8ce0253ccb5050 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 6 Aug 2012 17:00:17 -0700
Subject: [PATCH] Make ActionBar fail more cleanly when invalid heights are set

Also add "none" flag value for null displayOptions in xml

Change-Id: Ided3433638f02ba2a18ce08db265d7a8ac4f216c
---
 core/java/com/android/internal/widget/ActionBarView.java | 2 +-
 core/res/res/values/attrs.xml                            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 8ff39d69d8cbb..d85e816da135b 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 6386bcb74f100..5d8d3974c28dc 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" />