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

Commit 7cc4778c authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Introduced the ability to theme TabWidget.

parent d4e01d57

api/current.xml

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

>

</field>

<field name="bottomLeftStrip"

 type="int"

 transient="false"

 volatile="false"

 value="16843405"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="bottomMedium"

 type="int"

 transient="false"
@@ -1945,6 +1956,17 @@ 
 visibility="public"

>

</field>

<field name="bottomRightStrip"

 type="int"

 transient="false"

 volatile="false"

 value="16843403"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="bufferType"

 type="int"

 transient="false"
@@ -7104,6 +7126,17 @@ 
 visibility="public"

>

</field>

<field name="tabIndicatorStyle"

 type="int"

 transient="false"

 volatile="false"

 value="16843404"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="tabWidgetStyle"

 type="int"

 transient="false"
@@ -12483,6 +12516,17 @@ 
 visibility="public"

>

</field>

<field name="Widget_TabIndicator"

 type="int"

 transient="false"

 volatile="false"

 value="16973915"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="Widget_TabWidget"

 type="int"

 transient="false"

core/java/android/widget/TabWidget.java

+8 −6
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.Rect; 
import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.util.Log;

import android.util.TypedValue;

import android.view.View;

import android.view.ViewGroup;

import android.view.View.OnFocusChangeListener;
@@ -59,13 +60,18 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { 
    }



    public TabWidget(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs);

        super(context, attrs, defStyle);

        initTabWidget();



        TypedArray a = 

            context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.TabWidget,

                    defStyle, 0);

        

        mBottomLeftStrip = a.getDrawableWithContext(context, 

                com.android.internal.R.styleable.TabWidget_bottomLeftStrip);

        mBottomRightStrip = a.getDrawableWithContext(context,

                com.android.internal.R.styleable.TabWidget_bottomRightStrip);

        

        a.recycle();

    }
@@ -77,10 +83,6 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { 


    private void initTabWidget() {

        setOrientation(LinearLayout.HORIZONTAL);

        mBottomLeftStrip = mContext.getResources().getDrawable(

                com.android.internal.R.drawable.tab_bottom_left);

        mBottomRightStrip = mContext.getResources().getDrawable(

                com.android.internal.R.drawable.tab_bottom_right);

        // Deal with focus, as we don't want the focus to go by default

        // to a tab other than the current tab

        setFocusable(true);

core/res/res/layout/tab_indicator.xml

+3 −2
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ 


<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="0dip"

    android:layout_height="64dip"

    android:layout_height="wrap_content"

    android:layout_weight="1"

    android:orientation="vertical"

    android:background="@android:drawable/tab_indicator">

    style="?android:attr/tabIndicatorStyle"

    >



    <ImageView android:id="@+id/icon"

        android:layout_width="wrap_content"

core/res/res/values/attrs.xml

+13 −0
Original line number Diff line number Diff line
@@ -144,6 +144,15 @@ 
        <!-- ToggleButton style. -->

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



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

        <!-- Tab styles -->

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

        <eat-comment />

        

        <!-- Style for the inflated indicator widget itself, not the text or

             image views typically contained within. -->

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

        

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

        <!-- Gallery styles -->

        <!-- ============== -->
@@ -1722,6 +1731,10 @@ 
        <attr name="layout_span" format="integer" />

    </declare-styleable>

    <declare-styleable name="TabWidget">

        <!-- Bottom-left tab strip. -->

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

        <!-- Bottom-right tab strip. -->

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

    </declare-styleable>

    <declare-styleable name="TextAppearance">

        <!-- Text color. -->

core/res/res/values/public.xml

+7 −0
Original line number Diff line number Diff line
@@ -1071,6 +1071,8 @@ 
  <public type="style" name="Theme.Panel" id="0x01030059" />

  <public type="style" name="Theme.Light.Panel" id="0x0103005a" />



  <public type="style" name="Widget.TabIndicator" id="0x0103005b" />

  

  <public type="string" name="dialog_alert_title" id="0x01040014" />

  <public type="string" name="VideoView_error_text_invalid_progressive_playback" id="0x01040015" />
@@ -1096,6 +1098,11 @@ 
  <public type="attr" name="dialogTheme" id="0x01010287" />

  <public type="attr" name="alertDialogTheme" id="0x01010288" />

  <public type="attr" name="listItemTextViewStyle" id="0x01010289" />

  <!-- Someone is already using 0x0101028a? -->

  <eat-comment />

  <public type="attr" name="bottomLeftStrip" id="0x0101028d" />

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

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



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

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