From 8745e5aab9ed119bcf22be0eff1ca6e58ae56c73 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 12 May 2021 11:45:22 -0400
Subject: [PATCH] Notif Settings polish

Adjusting strings and margins

Test: visual
Fixes: 187868912
Fixes: 187853607
Change-Id: I976d0b8b2067556ed95e4610dd6ea3b85e6fc82f
---
 res/layout/conversations_clear_recents.xml |  2 +-
 res/layout/notif_importance_preference.xml |  5 ++++-
 res/values/strings.xml                     | 12 ++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/res/layout/conversations_clear_recents.xml b/res/layout/conversations_clear_recents.xml
index b7904399c23..472afdcf049 100644
--- a/res/layout/conversations_clear_recents.xml
+++ b/res/layout/conversations_clear_recents.xml
@@ -23,7 +23,7 @@
     <Button
         android:id="@+id/conversation_settings_clear_recents"
         style="@style/ActionPrimaryButton"
-        android:layout_marginStart="@dimen/screen_margin_sides"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingEnd"
         android:layout_marginEnd="@dimen/description_margin_sides"
         android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"
         android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"
diff --git a/res/layout/notif_importance_preference.xml b/res/layout/notif_importance_preference.xml
index edc2bb1df34..6e4786ee4be 100644
--- a/res/layout/notif_importance_preference.xml
+++ b/res/layout/notif_importance_preference.xml
@@ -21,7 +21,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:padding="@dimen/notification_importance_toggle_marginTop"
+    android:layout_marginStart="24dp"
+    android:layout_marginEnd="24dp"
+    android:paddingTop="@dimen/notification_importance_toggle_marginTop"
+    android:paddingBottom="@dimen/notification_importance_toggle_marginTop"
     android:orientation="vertical">
 
     <com.android.settings.notification.NotificationButtonRelativeLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a48ff772249..57d10f37253 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8962,7 +8962,7 @@
     <string name="recent_conversations">Recent conversations</string>
 
     <!-- [CHAR LIMIT=40] button title -->
-    <string name="conversation_settings_clear_recents">Clear all of the recent ones</string>
+    <string name="conversation_settings_clear_recents">Clear recent conversations</string>
 
     <!-- a11y string -->
     <string name="clear">Clear</string>
@@ -9142,11 +9142,11 @@
     <string name="notification_listener_disable_warning_cancel">Cancel</string>
     <string name="notification_listener_type_title">Allowed notification types</string>
     <string name="notif_type_ongoing">Real-time</string>
-    <string name="notif_type_ongoing_summary">Real-time communication from apps in use, navigation, phone calls, and more</string>
+    <string name="notif_type_ongoing_summary">Ongoing communication from apps in use, navigation, phone calls, and more</string>
     <string name="notif_type_conversation">Conversations</string>
-    <string name="notif_type_conversation_summary">SMS and other communications</string>
-    <string name="notif_type_alerting">Default</string>
-    <string name="notif_type_alerting_summary">Notifications that may ring or vibrate based on settings</string>
+    <string name="notif_type_conversation_summary">SMS, text messages, and other communications</string>
+    <string name="notif_type_alerting">Notifications</string>
+    <string name="notif_type_alerting_summary">May ring or vibrate based on settings</string>
     <string name="notif_type_silent">Silent</string>
     <string name="notif_type_silent_summary">Notifications that never make sound or vibrations</string>
     <!-- category header for apps allowed to read notifications. [CHAR LIMIT=45] -->
@@ -9156,7 +9156,7 @@
 
     <!-- Per notification listener, a list of apps whose notifications this listener cannot see -->
     <string name="notif_listener_excluded_app_title">See all apps</string>
-    <string name="notif_listener_excluded_app_summary">Change notification settings for each app that can send notifications</string>
+    <string name="notif_listener_excluded_app_summary">Change settings for each app that sends notifications</string>
     <string name="notif_listener_excluded_app_screen_title">Apps shown on device</string>
     <string name="notif_listener_not_migrated">This app doesn\u2019t support enhanced settings</string>