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

Commit 6b2fda9f authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb

parents cfd0bafd 55f3af27

api/current.xml

+22 −0
Original line number Diff line number Diff line
@@ -1885,6 +1885,28 @@ 
 visibility="public"

>

</field>

<field name="actionMenuTextAppearance"

 type="int"

 transient="false"

 volatile="false"

 value="16843616"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="actionMenuTextColor"

 type="int"

 transient="false"

 volatile="false"

 value="16843617"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="actionModeBackground"

 type="int"

 transient="false"

core/res/res/layout/action_menu_item_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:visibility="gone"

            android:textAppearance="?attr/textAppearanceMedium"

            android:textAppearance="?attr/actionMenuTextAppearance"

            style="?attr/buttonStyleSmall"

            android:textColor="?attr/textColorPrimary"

            android:textColor="?attr/actionMenuTextColor"

            android:background="@null"

            android:paddingLeft="4dip"

            android:paddingRight="4dip" />

core/res/res/values/attrs.xml

+5 −1
Original line number Diff line number Diff line
@@ -587,7 +587,11 @@ 
        <attr name="actionBarSize" format="dimension" >

            <enum name="wrap_content" value="0" />

        </attr>



        <!-- TextAppearance style that will be applied to text that

             appears within action menu items. -->

        <attr name="actionMenuTextAppearance" format="reference" />

        <!-- Color for text that appears within action menu items. -->

        <attr name="actionMenuTextColor" format="color|reference" />



        <!-- =================== -->

        <!-- Action mode styles  -->

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -1430,6 +1430,8 @@ 
  <public type="attr" name="calendarViewStyle" />

  <public type="attr" name="textEditSidePasteWindowLayout" />

  <public type="attr" name="textEditSideNoPasteWindowLayout" />

  <public type="attr" name="actionMenuTextAppearance" />

  <public type="attr" name="actionMenuTextColor" />



  <!-- A simple fade-in animation. -->

  <public type="animator" name="fade_in" id="0x010b0000" />

core/res/res/values/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -270,6 +270,8 @@ 
        <item name="actionBarStyle">@android:style/Widget.ActionBar</item>

        <item name="actionBarSize">56dip</item>

        <item name="actionModePopupWindowStyle">?android:attr/popupWindowStyle</item>

        <item name="actionMenuTextAppearance">?android:attr/textAppearanceMedium</item>

        <item name="actionMenuTextColor">?android:attr/textColorPrimary</item>



        <item name="dividerVertical">@drawable/divider_vertical_dark</item>

        <item name="dividerHorizontal">@drawable/divider_vertical_dark</item>