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

Commit 162dca96 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix all apps & widgets picker tabs ripple effect" into sc-dev

parents 11605d84 33a32837

res/drawable/personal_work_tabs_ripple.xml

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

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

    <shape android:shape="rectangle">

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

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

    </shape>

</ripple>
 
 No newline at end of file

res/layout/all_apps_personal_work_tabs.xml

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

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

        android:background="@drawable/personal_work_tabs_ripple"

        android:text="@string/all_apps_personal_tab"

        android:textColor="@color/all_apps_tab_text"

        android:textSize="16sp" />
@@ -42,7 +42,7 @@ 
        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

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

        android:background="@drawable/personal_work_tabs_ripple"

        android:text="@string/all_apps_work_tab"

        android:textColor="@color/all_apps_tab_text"

        android:textSize="16sp" />

res/layout/widgets_personal_work_tabs.xml

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_height="@dimen/all_apps_header_pill_height"

    android:layout_marginHorizontal="16dp"

    android:orientation="horizontal"

    android:background="@drawable/all_apps_tabs_background"

    android:elevation="2dp"

    style="@style/TextHeadline">
@@ -30,7 +31,7 @@ 
        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

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

        android:background="@drawable/personal_work_tabs_ripple"

        android:text="@string/widgets_full_sheet_personal_tab"

        android:textColor="@color/all_apps_tab_text"

        android:textSize="14sp" />
@@ -40,7 +41,7 @@ 
        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

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

        android:background="@drawable/personal_work_tabs_ripple"

        android:text="@string/widgets_full_sheet_work_tab"

        android:textColor="@color/all_apps_tab_text"

        android:textSize="14sp" />