Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ab17ad4 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 51c6ae52: am ecbbfdd3: Merge "Make ActionBar fail more cleanly when invalid... 

am 51c6ae52: am ecbbfdd3: Merge "Make ActionBar fail more cleanly when invalid heights are set" into jb-mr1-dev

* commit '51c6ae52':
  Make ActionBar fail more cleanly when invalid heights are set
parents 863ee258 51c6ae52

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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();

core/res/res/values/attrs.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -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" />