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

Commit 7b8d9ce1 authored by Flavio Lerda's avatar Flavio Lerda Committed by Android (Google) Code Review
Browse files

Merge "Use correct background for selected items."

parents d87781e6 c92fb188

res/drawable/list_selector.xml

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

<!-- Copyright (C) 2010 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"

    android:exitFadeDuration="@android:integer/config_mediumAnimTime">

    <item

        android:state_window_focused="false"

        android:drawable="@android:color/transparent" />

    <item

        android:state_focused="true"

        android:state_pressed="true"

        android:drawable="@drawable/list_pressed_holo" />

    <item

        android:state_focused="false"

        android:state_pressed="true"

        android:drawable="@drawable/list_pressed_holo" />

    <item

        android:state_focused="true"

        android:drawable="@drawable/list_focused_holo" />

    <item

        android:drawable="@android:color/transparent" />

</selector>

res/layout/call_log_list_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
                android:paddingBottom="@dimen/call_log_inner_margin"

                android:paddingRight="@dimen/call_log_outer_margin"

                android:scaleType="center"

                android:background="@drawable/list_selector"

                android:background="?android:attr/selectableItemBackground"

            />

        </LinearLayout>

        <LinearLayout
@@ -97,7 +97,7 @@ 
            android:layout_centerVertical="true"

            android:padding="@dimen/call_log_inner_margin"

            android:orientation="vertical"

            android:background="@drawable/list_selector"

            android:background="?android:attr/selectableItemBackground"

            android:focusable="true"

        >

            <TextView

res/layout/call_log_voicemail_status.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
            android:paddingLeft="@dimen/call_log_inner_margin"

            android:paddingRight="@dimen/call_log_outer_margin"

            android:textColor="?attr/call_log_voicemail_status_text_color"

            android:background="@drawable/list_selector"

            android:background="?android:attr/selectableItemBackground"

            android:clickable="true"

        />

    </LinearLayout>