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

Commit a1d9ae69 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 4961844 - Allow split style action bar to have 2 different colors 

Add the actionBarSplitStyle theme attribute. It defaults to the value
of actionBarStyle.

Change-Id: I5e929114d9cc163df0dd429aa0714b88a1f6a7a9
parent d2ab6d07

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ package android { 
    field public static final int accountType = 16843407; // 0x101028f

    field public static final int action = 16842797; // 0x101002d

    field public static final int actionBarSize = 16843499; // 0x10102eb

    field public static final int actionBarSplitStyle = 16843676; // 0x101039c

    field public static final int actionBarStyle = 16843470; // 0x10102ce

    field public static final int actionBarTabBarStyle = 16843508; // 0x10102f4

    field public static final int actionBarTabStyle = 16843507; // 0x10102f3

core/res/res/layout/screen_action_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ This is an optimized layout for a screen with the Action Bar enabled. 
    <com.android.internal.widget.ActionBarContainer android:id="@+id/split_action_bar"

                  android:layout_width="match_parent"

                  android:layout_height="wrap_content"

                  style="?android:attr/actionBarStyle"

                  style="?android:attr/actionBarSplitStyle"

                  android:visibility="gone"

                  android:gravity="center"/>

</LinearLayout>

core/res/res/layout/screen_action_bar_overlay.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ the Action Bar enabled overlaying application content. 
                  android:layout_width="match_parent"

                  android:layout_height="wrap_content"

                  android:layout_alignParentBottom="true"

                  style="?android:attr/actionBarStyle"

                  style="?android:attr/actionBarSplitStyle"

                  android:visibility="gone"

                  android:gravity="center"/>

</RelativeLayout>

core/res/res/values/attrs.xml

+5 −0
Original line number Diff line number Diff line
@@ -596,6 +596,11 @@ 
        <attr name="actionOverflowButtonStyle" format="reference" />

        <!-- Reference to a style for the Action Bar -->

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

        <!-- Reference to a style for the split Action Bar. This style

             controls the split component that holds the menu/action

             buttons. actionBarStyle is still used for the primary

             bar. -->

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

        <!-- Size of the Action Bar, including the contextual

             bar used to present Action Modes. -->

        <attr name="actionBarSize" format="dimension" >

core/res/res/values/public.xml

+7 −6
Original line number Diff line number Diff line
@@ -1769,16 +1769,17 @@ 
  <public type="attr" name="listPreferredItemHeightLarge" />

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



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

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

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

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



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



  <public type="style" name="Widget.Holo.Button.Borderless.Small" />

  <public type="style" name="Widget.Holo.Light.Button.Borderless.Small" />



  <public type="integer" name="status_bar_notification_info_maxnum" />

  <public type="string" name="status_bar_notification_info_overflow" />



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

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



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

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



</resources>