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

Commit b82a517f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding ripple effect to the "All Apps tab" buttons." into sc-v2-dev am:... 

Merge "Adding ripple effect to the "All Apps tab" buttons." into sc-v2-dev am: 3ba95852 am: 5cf55827

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16359044

Change-Id: I043288685528d6430f38b93e19e468069071a503
parents 70f3f867 5cf55827

res/color-night-v31/accent_ripple_color.xml

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

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

    <item android:color="@android:color/system_accent1_300"/>

</selector>
 
 No newline at end of file

res/color-night/accent_ripple_color.xml

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

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

    <item android:color="#53BCAC"/>

</selector>
 
 No newline at end of file

res/color-v31/accent_ripple_color.xml

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

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

    <item android:color="@android:color/system_accent2_50"/>

</selector>
 
 No newline at end of file

res/color/accent_ripple_color.xml

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

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

    <item android:color="#CDFAF1"/>

</selector>
 
 No newline at end of file

res/drawable/all_apps_tabs_background.xml

+27 −14
Original line number Diff line number Diff line
@@ -13,8 +13,18 @@ 
     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:enterFadeDuration="100">

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

    android:color="@color/accent_ripple_color">



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

        <shape android:shape="rectangle">

            <corners android:radius="@dimen/all_apps_header_pill_corner_radius" />

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

        </shape>

    </item>



    <item>

        <selector android:enterFadeDuration="100">

            <item

                android:id="@+id/unselected"

                android:state_selected="false">
@@ -33,3 +43,6 @@ 
                </shape>

            </item>

        </selector>

    </item>



</ripple>
 
 No newline at end of file