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

Commit f59b9193 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Add touch feedback to action buttons" into lmp-mr1-dev

parents 94205422 b2791310

res/drawable/action_button_background.xml

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

<!--

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

-->

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

    android:color="?android:attr/colorControlHighlight">

    <!-- Transparent background constrains the touch feedback ripple to the button, but also allows

         touch feedback ripples in the parent to show under the button. -->

    <item>

        <shape android:shape="rectangle"  >

            <solid android:color="@android:color/transparent" />

        </shape>

    </item>

</ripple>

res/layout/call_log_list_item_actions.xml

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        >

        <TextView

            android:id="@+id/call_back_action"

            android:background="@drawable/action_button_background"

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

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"
@@ -46,7 +46,7 @@ 
            android:singleLine="true"/>

        <TextView

            android:id="@+id/video_call_action"

            android:background="@drawable/action_button_background"

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

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"
@@ -62,7 +62,7 @@ 
            android:singleLine="true"/>

        <TextView

            android:id="@+id/voicemail_action"

            android:background="@drawable/action_button_background"

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

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"
@@ -78,7 +78,7 @@ 
            android:singleLine="true"/>

        <TextView

            android:id="@+id/details_action"

            android:background="@drawable/action_button_background"

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

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"
@@ -94,7 +94,7 @@ 
            android:singleLine="true"/>

        <TextView

            android:id="@+id/report_action"

            android:background="@drawable/action_button_background"

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

            android:gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"