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

Commit 13194b16 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1

parents 2f99bb5e d1a956b5

core/res/res/drawable/tab_indicator_ab_holo.xml

0 → 100644
+34 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

    <!-- Non focused states -->

    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@color/transparent" />

    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/tab_selected_holo" />



    <!-- Focused states -->

    <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/list_focused_holo" />

    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/tab_selected_focused_holo" />



    <!-- Pressed -->

    <!--    Non focused states -->

    <item android:state_focused="false" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/list_pressed_holo_dark" />

    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_holo" />



    <!--    Focused states -->

    <item android:state_focused="true" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_holo" />

    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_holo" />

</selector>

core/res/res/values/styles.xml

+6 −1
Original line number Original line Diff line number Diff line
@@ -1823,6 +1823,7 @@ please see styles_device_defaults.xml. 
    </style>

    </style>





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

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

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

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_weight">1</item>

        <item name="android:layout_weight">1</item>

        <item name="android:minWidth">80dip</item>

        <item name="android:minWidth">80dip</item>
@@ -1910,7 +1911,7 @@ please see styles_device_defaults.xml. 
    </style>

    </style>





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

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

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

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

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

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

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

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

    </style>

    </style>
@@ -2277,6 +2278,10 @@ please see styles_device_defaults.xml. 
    </style>

    </style>





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

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

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

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_weight">1</item>

        <item name="android:minWidth">80dip</item>

    </style>

    </style>





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

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