diff options
| author | 2021-04-15 06:56:04 +0000 | |
|---|---|---|
| committer | 2021-04-15 06:56:04 +0000 | |
| commit | 5ec2a767bdf5adf3d6fca63cd354ccaabec6f5dc (patch) | |
| tree | 79d3cd7dd2220fadbec4c7e8a64f713adb96deba | |
| parent | a14d76517afb93780dd26cfe1eef627672954002 (diff) | |
| parent | a2ed9b6bef7b95e9855e34810d400bdfbc3ddec2 (diff) | |
Merge "Fix snooze view" into sc-dev
| -rw-r--r-- | packages/SystemUI/res/layout/notification_snooze.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/notification_snooze_option.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/packages/SystemUI/res/layout/notification_snooze.xml b/packages/SystemUI/res/layout/notification_snooze.xml index dc9d92001351..bb82f91fe2a0 100644 --- a/packages/SystemUI/res/layout/notification_snooze.xml +++ b/packages/SystemUI/res/layout/notification_snooze.xml @@ -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"/> diff --git a/packages/SystemUI/res/layout/notification_snooze_option.xml b/packages/SystemUI/res/layout/notification_snooze_option.xml index f2038397014f..d42cc0212fd8 100644 --- a/packages/SystemUI/res/layout/notification_snooze_option.xml +++ b/packages/SystemUI/res/layout/notification_snooze_option.xml @@ -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" diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 4ae1c936d1a9..b5a07eb5feb1 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -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> |