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

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

Merge "Make footer button tap target 48dp tall" into sc-qpr1-dev am:... 

Merge "Make footer button tap target 48dp tall" into sc-qpr1-dev am: be7e7e2d am: 317613f8 am: ee0b6e83

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15854192

Change-Id: I0b9533911b0eb75fdc7ec9fda37369da6824b36e
parents 3dab6c02 ee0b6e83

packages/SystemUI/res/drawable/notif_footer_btn_background.xml

+16 −15
Original line number Original line Diff line number Diff line
@@ -14,19 +14,20 @@ 
  ~ See the License for the specific language governing permissions and

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  ~ limitations under the License.

  -->

  -->



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



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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

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

    <solid

    <item>

        android:color="?androidprv:attr/colorSurface"

        <inset

        />

            android:insetBottom="4dp"

            android:insetTop="4dp">

            <shape android:shape="rectangle">

                <corners android:radius="20dp" />

                <corners android:radius="20dp" />



                <padding

                <padding

                    android:left="20dp"

                    android:left="20dp"

        android:right="20dp">

                    android:right="20dp" />

    </padding>

                <solid android:color="?androidprv:attr/colorSurface" />



            </shape>

            </shape>

        </inset>

    </item>

</ripple>

packages/SystemUI/res/layout/status_bar_notification_footer.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -30,8 +30,8 @@ 
            style="@style/TextAppearance.NotificationSectionHeaderButton"

            style="@style/TextAppearance.NotificationSectionHeaderButton"

            android:id="@+id/manage_text"

            android:id="@+id/manage_text"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="40dp"

            android:layout_height="48dp"

            android:layout_marginTop="16dp"

            android:layout_marginTop="12dp"

            android:layout_gravity="start"

            android:layout_gravity="start"

            android:background="@drawable/notif_footer_btn_background"

            android:background="@drawable/notif_footer_btn_background"

            android:focusable="true"

            android:focusable="true"
@@ -43,8 +43,8 @@ 
            style="@style/TextAppearance.NotificationSectionHeaderButton"

            style="@style/TextAppearance.NotificationSectionHeaderButton"

            android:id="@+id/dismiss_text"

            android:id="@+id/dismiss_text"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="40dp"

            android:layout_height="48dp"

            android:layout_marginTop="16dp"

            android:layout_marginTop="12dp"

            android:layout_gravity="end"

            android:layout_gravity="end"

            android:background="@drawable/notif_footer_btn_background"

            android:background="@drawable/notif_footer_btn_background"

            android:focusable="true"

            android:focusable="true"