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

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

Merge "Fix snooze view" into sc-dev

parents a14d7651 a2ed9b6b

packages/SystemUI/res/layout/notification_snooze.xml

+3 −2
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 


<com.android.systemui.statusbar.notification.row.NotificationSnooze

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

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

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

    android:theme="@style/Theme.SystemUI">



    <RelativeLayout
@@ -34,7 +35,7 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentStart="true"

            android:layout_centerVertical="true"

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

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

            android:textColor="?android:attr/textColorPrimary"

            android:paddingEnd="4dp"/>

packages/SystemUI/res/layout/notification_snooze_option.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
<TextView

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

        android:layout_width="match_parent"

        android:layout_height="48dp"

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

        android:layout_height="@*android:dimen/notification_headerless_min_height"

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

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

        android:gravity="center_vertical"

        android:textSize="14sp"

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2012,7 +2012,7 @@ 
    <string name="notification_menu_settings_action">Settings</string>



    <!-- Notification: Snooze panel: Snooze undo button label. [CHAR LIMIT=50]-->

    <string name="snooze_undo">UNDO</string>

    <string name="snooze_undo">Undo</string>



    <!-- Notification: Snooze panel: message indicating how long the notification was snoozed for. [CHAR LIMIT=100]-->

    <string name="snoozed_for_time">Snoozed for <xliff:g id="time_amount" example="15 minutes">%1$s</xliff:g></string>