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

Commit c28af685 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Introduced textAppearanceTab attribute to decouple tabWidgetStyle from the tab... 

Introduced textAppearanceTab attribute to decouple tabWidgetStyle from the tab indicator's text label.
parent f23daf3c

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -7401,6 +7401,17 @@ 
 visibility="public"

>

</field>

<field name="textAppearanceTab"

 type="int"

 transient="false"

 volatile="false"

 value="16843406"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="textCheckMark"

 type="int"

 transient="false"

core/res/res/layout/tab_indicator.xml

+3 −1
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ 
        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_centerHorizontal="true"

        style="?android:attr/tabWidgetStyle"

        android:ellipsize="marquee"

        android:singleLine="true"

        android:textAppearance="?android:attr/textAppearanceTab"

    />



</RelativeLayout>

core/res/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -153,6 +153,10 @@ 
             image views typically contained within. -->

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



        <!-- Style for the text label on the default indicator.  Previously

             was lumped with tabWidgetStyle. -->

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

        

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

        <!-- Gallery styles -->

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

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,7 @@ 
  <public type="attr" name="bottomLeftStrip" id="0x0101028d" />

  <public type="attr" name="bottomRightStrip" id="0x0101028b" />

  <public type="attr" name="tabIndicatorStyle" id="0x0101028c" />

  <public type="attr" name="textAppearanceTab" id="0x0101028e" />



  <public type="integer" name="config_shortAnimTime" id="0x010e0000" />

  <public type="integer" name="config_mediumAnimTime" id="0x010e0001" />

core/res/res/values/styles.xml

+0 −3
Original line number Diff line number Diff line
@@ -446,9 +446,6 @@ 
    </style>



    <style name="Widget.TabWidget">

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

        <item name="ellipsize">marquee</item>

        <item name="singleLine">true</item>

        <item name="android:bottomLeftStrip">@android:drawable/tab_bottom_left</item>

        <item name="android:bottomRightStrip">@android:drawable/tab_bottom_right</item>

    </style>