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

Commit c09a39d7 authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge "[Notif] Fix BH & Snooze button bounds and UI" into pi-dev

parents 018166c1 c032ac90

packages/SystemUI/res/layout/notification_info.xml

+20 −17
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
    android:clipChildren="false"

    android:clipToPadding="false"

    android:orientation="vertical"

        android:paddingStart="@*android:dimen/notification_content_margin_start"

        android:paddingEnd="@*android:dimen/notification_content_margin_end"

    android:background="@color/notification_guts_bg_color"

    android:theme="@*android:style/Theme.DeviceDefault.Light">
@@ -34,6 +32,7 @@ 
        android:id="@+id/header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="@*android:dimen/notification_content_margin_start"

        android:clipChildren="false"

        android:clipToPadding="false">

        <ImageView
@@ -73,13 +72,13 @@ 
            android:maxLines="1"

            android:layout_centerVertical="true"

            android:layout_toEndOf="@id/pkg_group_divider" />

        <!-- 24 dp icon with 16 dp padding all around to mirror notification content margins -->

        <ImageButton

            android:id="@+id/info"

            android:layout_width="56dp"

            android:layout_height="56dp"

            android:layout_alignParentEnd="true"

            android:layout_centerVertical="true"

            android:layout_marginEnd="-16dp"

            android:background="@drawable/ripple_drawable"

            android:contentDescription="@string/notification_more_settings"

            android:padding="16dp"
@@ -100,6 +99,8 @@ 
        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="@*android:dimen/notification_content_margin_start"

            android:layout_marginEnd="@*android:dimen/notification_content_margin_start"

            android:orientation="vertical">

            <!-- Channel Name -->

            <TextView
@@ -120,9 +121,11 @@ 
        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:layout_marginTop="@dimen/notification_guts_button_spacing"

            android:gravity="end" >

            android:layout_marginStart="@dimen/notification_guts_button_side_margin"

            android:layout_marginEnd="@dimen/notification_guts_button_side_margin"

            android:gravity="end"

            android:orientation="horizontal">



            <!-- Optional link to app. Only appears if the channel is not disabled and the app

            asked for it -->
@@ -154,7 +157,6 @@ 
                android:text="@string/inline_keep_button"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_marginEnd="-8dp"

                android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"

                style="@style/TextAppearance.NotificationInfo.Button"/>

        </LinearLayout>
@@ -165,6 +167,8 @@ 
        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/notification_guts_button_spacing"

        android:layout_marginTop="@dimen/notification_guts_button_spacing"

        android:layout_marginStart="@dimen/notification_guts_button_side_margin"

        android:layout_marginEnd="@dimen/notification_guts_button_side_margin"

        android:visibility="gone"

        android:orientation="horizontal" >

        <TextView
@@ -180,7 +184,6 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentEnd="true"

            android:layout_centerVertical="true"

            android:layout_marginEnd="-8dp"

            android:text="@string/inline_undo"

            style="@style/TextAppearance.NotificationInfo.Button"/>

    </RelativeLayout>

packages/SystemUI/res/layout/notification_snooze.xml

+4 −4
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ 


        <TextView

            android:id="@+id/undo"

            style="@style/TextAppearance.NotificationInfo.Button"

            android:layout_width="wrap_content"

            android:layout_height="36dp"

            android:layout_marginEnd="@*android:dimen/notification_content_margin_end"

            android:layout_height="48dp"

            android:layout_marginEnd="@dimen/notification_guts_button_side_margin"

            android:layout_alignParentEnd="true"

            android:layout_centerVertical="true"

            android:text="@string/snooze_undo" />

            android:text="@string/snooze_undo"

            style="@style/TextAppearance.NotificationInfo.Button" />

    </RelativeLayout>



    <View

packages/SystemUI/res/values/dimens.xml

+4 −1
Original line number Diff line number Diff line
@@ -161,11 +161,14 @@ 
    <!-- The vertical space around the buttons in the inline settings -->

    <dimen name="notification_guts_button_spacing">6dp</dimen>



    <!-- Extra horizontal space for properly aligning guts buttons with the notification content -->

    <dimen name="notification_guts_button_side_margin">8dp</dimen>



    <!-- The vertical padding a notification guts button has to fulfill the 48dp touch target -->

    <dimen name="notification_guts_button_vertical_padding">14dp</dimen>



    <!-- The horizontal padding for notification guts buttons-->

    <dimen name="notification_guts_button_horizontal_padding">14dp</dimen>

    <dimen name="notification_guts_button_horizontal_padding">8dp</dimen>



    <!-- The horizontal space around the buttons in the inline settings -->

    <dimen name="notification_guts_button_horizontal_spacing">8dp</dimen>