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

Commit 63730319 authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Use Selector instead of Ripple on pre-L" into ub-contactsdialer-b-dev

parents 38f2d0f7 1bf919a5

res/drawable-v21/floating_action_button.xml

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

<!--

     Copyright (C) 2015 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="@color/contacts_accent_color">

     <item android:id="@android:id/mask">

          <shape android:shape="oval">

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

          </shape>

     </item>

</ripple>
 
 No newline at end of file

res/drawable-v21/view_pager_tab_background.xml

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

<!--

  ~ Copyright (C) 2015 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="@color/tab_ripple_color">

    <item android:id="@android:id/mask">

        <color android:color="@android:color/white" />

    </item>

</ripple>
 
 No newline at end of file

res/drawable/floating_action_button.xml

+4 −5
Original line number Diff line number Diff line
@@ -15,11 +15,10 @@ 
     limitations under the License.

-->



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

     android:color="@color/contacts_accent_color">

     <item android:id="@android:id/mask">

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

     <item android:state_pressed="true">

          <shape android:shape="oval">

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

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

          </shape>

     </item>

</ripple>
 
 No newline at end of file
 
</selector>
 
 No newline at end of file

res/drawable/view_pager_tab_background.xml

+5 −6
Original line number Diff line number Diff line
@@ -14,9 +14,8 @@ 
  ~ 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="@color/tab_ripple_color">

    <item android:id="@android:id/mask">

        <color android:color="@android:color/white" />

    </item>

</ripple>
 
 No newline at end of file
 
<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:state_pressed="true"

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

</selector>
 
 No newline at end of file