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

Commit 3863c2ea authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am ec760aeb: Merge "Add white touch feedback drawable to Dialer" into lmp-dev

* commit 'ec760aeb':
  Add white touch feedback drawable to Dialer
parents e26f190c ec760aeb
Loading
Loading
Loading
Loading
+0 −19
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.
-->

<!-- Based on the Theme.Material's default selectableItemBackgroundBorderless -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
    android:color="@color/ripple_material_dark" />
 No newline at end of file
+0 −23
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.
-->

<!-- Based on the Theme.Material's default selectableItemBackground -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
    android:color="@color/ripple_material_dark" >
    <item android:id="@android:id/mask">
        <color android:color="@android:color/white" />
    </item>
</ripple>
 No newline at end of file
+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@

    <color name="call_arrow_green">#2aad6f</color>
    <color name="call_arrow_red">#ff2e58</color>
    <!-- Color of ripples use by Theme.Material. Taken from res/values/colors_material.xml -->
    <color name="ripple_material_dark">#20ffffff</color>

    <color name="contact_all_list_background_color">#FFFFFF</color>
    <color name="contact_favorites_list_background_color">#FFFFFF</color>