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

Commit 73d54e7b authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 4381f642: Merge "Public styles for action bar tabs" into honeycomb-mr2 

* commit '4381f642':
  Public styles for action bar tabs
parents 799f04c0 4381f642

api/current.xml

+99 −0
Original line number Diff line number Diff line
@@ -16044,6 +16044,39 @@ 
 visibility="public"

>

</field>

<field name="Widget_ActionBar_TabBar"

 type="int"

 transient="false"

 volatile="false"

 value="16974068"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_ActionBar_TabText"

 type="int"

 transient="false"

 volatile="false"

 value="16974067"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_ActionBar_TabView"

 type="int"

 transient="false"

 volatile="false"

 value="16974066"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_ActionButton"

 type="int"

 transient="false"
@@ -16297,6 +16330,39 @@ 
 visibility="public"

>

</field>

<field name="Widget_Holo_ActionBar_TabBar"

 type="int"

 transient="false"

 volatile="false"

 value="16974071"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_Holo_ActionBar_TabText"

 type="int"

 transient="false"

 volatile="false"

 value="16974070"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_Holo_ActionBar_TabView"

 type="int"

 transient="false"

 volatile="false"

 value="16974069"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_Holo_ActionButton"

 type="int"

 transient="false"
@@ -16572,6 +16638,39 @@ 
 visibility="public"

>

</field>

<field name="Widget_Holo_Light_ActionBar_TabBar"

 type="int"

 transient="false"

 volatile="false"

 value="16974074"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_Holo_Light_ActionBar_TabText"

 type="int"

 transient="false"

 volatile="false"

 value="16974073"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_Holo_Light_ActionBar_TabView"

 type="int"

 transient="false"

 volatile="false"

 value="16974072"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_Holo_Light_ActionButton"

 type="int"

 transient="false"

core/res/res/values/public.xml

+10 −0
Original line number Diff line number Diff line
@@ -1661,4 +1661,14 @@ 
  <public type="style" name="Theme.Holo.Light.NoActionBar" />

  <public type="style" name="Theme.Holo.Light.NoActionBar.Fullscreen" />



  <public type="style" name="Widget.ActionBar.TabView" />

  <public type="style" name="Widget.ActionBar.TabText" />

  <public type="style" name="Widget.ActionBar.TabBar" />

  <public type="style" name="Widget.Holo.ActionBar.TabView" />

  <public type="style" name="Widget.Holo.ActionBar.TabText" />

  <public type="style" name="Widget.Holo.ActionBar.TabBar" />

  <public type="style" name="Widget.Holo.Light.ActionBar.TabView" />

  <public type="style" name="Widget.Holo.Light.ActionBar.TabText" />

  <public type="style" name="Widget.Holo.Light.ActionBar.TabBar" />



</resources>

core/res/res/values/styles.xml

+11 −11
Original line number Diff line number Diff line
@@ -1103,16 +1103,16 @@ 
        <item name="android:src">?android:attr/actionModeCloseDrawable</item>

    </style>



    <style name="Widget.ActionBarView_TabView">

    <style name="Widget.ActionBar.TabView" parent="Widget">

        <item name="android:background">@drawable/minitab_lt</item>

        <item name="android:paddingLeft">4dip</item>

        <item name="android:paddingRight">4dip</item>

    </style>



    <style name="Widget.ActionBarView_TabBar">

    <style name="Widget.ActionBar.TabBar" parent="Widget">

    </style>



    <style name="Widget.ActionBarView_TabText">

    <style name="Widget.ActionBar.TabText" parent="Widget">

        <item name="android:textAppearance">@style/TextAppearance.Widget.TextView.PopupMenu</item>

        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>

        <item name="android:textSize">18sp</item>
@@ -1753,19 +1753,19 @@ 
    <style name="Widget.Holo.ActionButton.TextButton" parent="Widget.Holo.ButtonBar.Button">

    </style>



    <style name="Widget.Holo.ActionBarView_TabView" parent="Widget.ActionBarView_TabView">

    <style name="Widget.Holo.ActionBar.TabView" parent="Widget.ActionBar.TabView">

        <item name="android:background">@drawable/tab_indicator_holo</item>

        <item name="android:paddingLeft">16dip</item>

        <item name="android:paddingRight">16dip</item>

    </style>



    <style name="Widget.Holo.Tab" parent="Widget.Holo.ActionBarView_TabView">

    <style name="Widget.Holo.Tab" parent="Widget.Holo.ActionBar.TabView">

    </style>



    <style name="Widget.Holo.ActionBarView_TabBar" parent="Widget.ActionBarView_TabBar">

    <style name="Widget.Holo.ActionBar.TabBar" parent="Widget.ActionBar.TabBar">

    </style>



    <style name="Widget.Holo.ActionBarView_TabText" parent="Widget.ActionBarView_TabText">

    <style name="Widget.Holo.ActionBar.TabText" parent="Widget.ActionBar.TabText">

        <item name="android:textAppearance">@style/TextAppearance.Holo.Medium</item>

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

        <item name="android:textSize">18sp</item>
@@ -2084,16 +2084,16 @@ 
        <item name="android:paddingRight">16dip</item>

    </style>



    <style name="Widget.Holo.Light.ActionBarView_TabView" parent="Widget.Holo.ActionBarView_TabView">

    <style name="Widget.Holo.Light.ActionBar.TabView" parent="Widget.Holo.ActionBar.TabView">

    </style>



    <style name="Widget.Holo.Light.Tab" parent="Widget.Holo.Light.ActionBarView_TabView">

    <style name="Widget.Holo.Light.Tab" parent="Widget.Holo.Light.ActionBar.TabView">

    </style>



    <style name="Widget.Holo.Light.ActionBarView_TabBar" parent="Widget.Holo.ActionBarView_TabBar">

    <style name="Widget.Holo.Light.ActionBar.TabBar" parent="Widget.Holo.ActionBar.TabBar">

    </style>



    <style name="Widget.Holo.Light.ActionBarView_TabText" parent="Widget.Holo.ActionBarView_TabText">

    <style name="Widget.Holo.Light.ActionBar.TabText" parent="Widget.Holo.ActionBar.TabText">

    </style>



    <style name="Widget.Holo.Light.ActionMode" parent="Widget.Holo.ActionMode">

core/res/res/values/themes.xml

+9 −9
Original line number Diff line number Diff line
@@ -266,9 +266,9 @@ 
        <item name="actionModeShareDrawable">@android:drawable/ic_menu_share_holo_dark</item>

        <item name="actionModeFindDrawable">@android:drawable/ic_menu_find_holo_dark</item>

        <item name="actionModeWebSearchDrawable">@android:drawable/ic_menu_search</item>

        <item name="actionBarTabStyle">@style/Widget.ActionBarView_TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.ActionBarView_TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.ActionBarView_TabText</item>

        <item name="actionBarTabStyle">@style/Widget.ActionBar.TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.ActionBar.TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.ActionBar.TabText</item>

        <item name="actionModeStyle">@style/Widget.ActionMode</item>

        <item name="actionModeCloseButtonStyle">@style/Widget.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@android:style/Widget.ActionBar</item>
@@ -1011,9 +1011,9 @@ 
        <item name="actionOverflowButtonStyle">@android:style/Widget.Holo.ActionButton.Overflow</item>

        <item name="actionModeBackground">@android:drawable/cab_background_holo_dark</item>

        <item name="actionModeCloseDrawable">@android:drawable/cab_ic_close_holo</item>

        <item name="actionBarTabStyle">@style/Widget.Holo.ActionBarView_TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.Holo.ActionBarView_TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.Holo.ActionBarView_TabText</item>

        <item name="actionBarTabStyle">@style/Widget.Holo.ActionBar.TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.Holo.ActionBar.TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.Holo.ActionBar.TabText</item>

        <item name="actionModeStyle">@style/Widget.Holo.ActionMode</item>

        <item name="actionModeCloseButtonStyle">@style/Widget.Holo.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@android:style/Widget.Holo.ActionBar</item>
@@ -1296,9 +1296,9 @@ 
        <item name="actionOverflowButtonStyle">@android:style/Widget.Holo.Light.ActionButton.Overflow</item>

        <item name="actionModeBackground">@android:drawable/cab_background_holo_light</item>

        <item name="actionModeCloseDrawable">@android:drawable/cab_ic_close_holo</item>

        <item name="actionBarTabStyle">@style/Widget.Holo.Light.ActionBarView_TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.Holo.Light.ActionBarView_TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.Holo.Light.ActionBarView_TabText</item>

        <item name="actionBarTabStyle">@style/Widget.Holo.Light.ActionBar.TabView</item>

        <item name="actionBarTabBarStyle">@style/Widget.Holo.Light.ActionBar.TabBar</item>

        <item name="actionBarTabTextStyle">@style/Widget.Holo.Light.ActionBar.TabText</item>

        <item name="actionModeStyle">@style/Widget.Holo.Light.ActionMode</item>

        <item name="actionModeCloseButtonStyle">@style/Widget.Holo.Light.ActionButton.CloseMode</item>

        <item name="actionBarStyle">@android:style/Widget.Holo.Light.ActionBar</item>