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

Commit f55546fd authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

Merge "ActionBarTab ripple draws below selection strip"

parents 1d719b5f b7059eb2

res-common/drawable/action_bar_tab.xml

+7 −3
Original line number Diff line number Diff line
@@ -14,8 +14,13 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<layer-list  xmlns:android="http://schemas.android.com/apk/res/android"

    android:tint="@color/tab_pressed_color">

    <item>

        <ripple android:tint="@color/tab_pressed_color">

            <item android:drawable="@color/tab_default_color" />

        </ripple>

    </item>

    <item>

        <selector>

            <item android:drawable="@drawable/tab_selected"
@@ -32,7 +37,6 @@ 
                    android:state_selected="false" />

            <item android:drawable="@drawable/tab_selected"

                    android:state_selected="true" />

            <item android:drawable="@color/tab_default_color" />

        </selector>

    </item>

</ripple>
 
 No newline at end of file
 
</layer-list>
 
 No newline at end of file

res-common/drawable/tab_selected.xml

+12 −6
Original line number Diff line number Diff line
@@ -15,9 +15,15 @@ 
     limitations under the License.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Tab selected underline -->

    <item android:drawable="@color/tab_selected_color" />

    <!-- Tab background -->

    <item android:drawable="@color/tab_default_color"

            android:bottom="@dimen/tab_selected_underline_height" />

    <!-- Use a rectangle to draw a bottom aligned line. The other three sides

         of the rectangle are off the side of the screen -->

    <item

        android:top="@dimen/tab_selected_underline_height_negative"

        android:right="@dimen/tab_selected_underline_height_negative"

        android:left="@dimen/tab_selected_underline_height_negative">

        <shape android:shape="rectangle">

            <stroke android:width="@dimen/tab_selected_underline_height"

                android:color="@color/tab_selected_color"/>

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

res-common/drawable/tab_selected_focused.xml

+3 −11
Original line number Diff line number Diff line
@@ -16,15 +16,7 @@ 
-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

    <!-- Tab selected underline -->

    <item android:drawable="@color/tab_selected_color" />

    <!-- Tab background -->

    <item android:drawable="@color/tab_default_color"

            android:bottom="@dimen/tab_selected_underline_height" />

    <item>

        <shape android:shape="rectangle" >

            <stroke

                android:width="4dp"

                android:color="@color/focus_color" />

        </shape>

    </item>

    <item android:drawable="@drawable/tab_selected" />

    <!-- Focus rectangle -->

    <item android:drawable="@drawable/tab_unselected_focused" />

</layer-list>
 
 No newline at end of file

res-common/drawable/tab_unselected_focused.xml

+6 −11
Original line number Diff line number Diff line
@@ -14,14 +14,9 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Tab background -->

    <item android:drawable="@color/tab_default_color" />

    <item>

        <shape android:shape="rectangle" >

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

    android:shape="rectangle" >

    <stroke

        android:width="4dp"

        android:color="@color/focus_color" />

</shape>
 
 No newline at end of file
 
    </item>

</layer-list>
 
 No newline at end of file

res-common/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 


    <!-- Height of the selection indicator of a tab. -->

    <dimen name="tab_selected_underline_height">3dp</dimen>

    <dimen name="tab_selected_underline_height_negative">-3dp</dimen>

    <!-- Size of text in tabs. -->

    <dimen name="tab_text_size">14sp</dimen>