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

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

Merge "Remove Contacts specific tab code from common" into lmp-dev

parents 8e39535e 1c901b9b

res-common/drawable/action_bar_tab.xml

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

<!--

     Copyright (C) 2013 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.

-->

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

    android:tint="@color/tab_pressed_color">

    <item>

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

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

        </ripple>

    </item>

    <item>

        <selector>

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

                    android:state_focused="false"

                    android:state_pressed="false"

                    android:state_selected="true" />

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

                    android:state_focused="true"

                    android:state_pressed="false"

                    android:state_selected="true" />

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

                    android:state_focused="true"

                    android:state_pressed="false"

                    android:state_selected="false" />

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

                    android:state_selected="true" />

        </selector>

    </item>

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

res-common/drawable/tab_selected.xml

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

<!--

     Copyright (C) 2013 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.

-->

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

    <!-- 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

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

<!--

     Copyright (C) 2013 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.

-->

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

    <!-- Tab selected underline -->

    <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

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

<!--

     Copyright (C) 2013 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.

-->

<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

res-common/values/colors.xml

+0 −4
Original line number Diff line number Diff line
@@ -75,10 +75,6 @@ 


    <color name="letter_tile_font_color">#ffffff</color>



    <color name="tab_default_color">@color/actionbar_background_color</color>

    <color name="tab_pressed_color">#0097a8</color>

    <color name="tab_selected_color">#0097a8</color>



    <!-- Background color of action bars. Ensure this stays in sync with packages/Telephony

         actionbar_background_color. -->

    <color name="actionbar_background_color">#0fc6dc</color>