diff options
| -rw-r--r-- | core/java/com/android/internal/widget/ConversationLayout.java | 3 | ||||
| -rw-r--r-- | core/res/res/layout/notification_template_material_conversation.xml | 15 | ||||
| -rw-r--r-- | core/res/res/values/dimens.xml | 7 |
3 files changed, 14 insertions, 11 deletions
diff --git a/core/java/com/android/internal/widget/ConversationLayout.java b/core/java/com/android/internal/widget/ConversationLayout.java index b7cdeadd482b..7c7d9312e2db 100644 --- a/core/java/com/android/internal/widget/ConversationLayout.java +++ b/core/java/com/android/internal/widget/ConversationLayout.java @@ -85,7 +85,7 @@ public class ConversationLayout extends FrameLayout private static final float COLOR_SHIFT_AMOUNT = 60; /** - * Pattren for filter some ingonable characters. + * Pattern for filter some ignorable characters. * p{Z} for any kind of whitespace or invisible separator. * p{C} for any kind of punctuation character. */ @@ -1245,7 +1245,6 @@ public class ConversationLayout extends FrameLayout } private void updateContentEndPaddings() { - // Let's make sure the conversation header can't run into the expand button when we're // collapsed and update the paddings of the content int headerPaddingEnd; diff --git a/core/res/res/layout/notification_template_material_conversation.xml b/core/res/res/layout/notification_template_material_conversation.xml index 0411f55e6006..d3857941969b 100644 --- a/core/res/res/layout/notification_template_material_conversation.xml +++ b/core/res/res/layout/notification_template_material_conversation.xml @@ -141,7 +141,7 @@ android:id="@+id/conversation_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/notification_header_separating_margin" + android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title" android:textSize="16sp" android:singleLine="true" @@ -154,8 +154,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?attr/notificationHeaderTextAppearance" - android:layout_marginStart="@dimen/notification_header_separating_margin" - android:layout_marginEnd="@dimen/notification_header_separating_margin" + android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" + android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" android:text="@string/notification_header_divider_symbol" android:layout_gravity="center" android:paddingTop="1sp" @@ -170,7 +170,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginStart="@dimen/notification_header_separating_margin" + android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" + android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" android:paddingTop="1sp" android:singleLine="true" /> @@ -180,8 +181,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?attr/notificationHeaderTextAppearance" - android:layout_marginStart="@dimen/notification_header_separating_margin" - android:layout_marginEnd="@dimen/notification_header_separating_margin" + android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" + android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" android:text="@string/notification_header_divider_symbol" android:layout_gravity="center" android:paddingTop="1sp" @@ -195,7 +196,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginStart="@dimen/notification_header_separating_margin" + android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" android:paddingTop="1sp" android:showRelative="true" android:singleLine="true" diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index a771904f115b..4ee919289f28 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -273,6 +273,9 @@ <!-- The margin before and after each of the items in the notification header. --> <dimen name="notification_header_separating_margin">2dp</dimen> + <!-- The margin before and after each of the items in the conversation header. --> + <dimen name="notification_conversation_header_separating_margin">4dp</dimen> + <!-- The absolute size of the notification expand icon. -2 for wrap_content. --> <dimen name="notification_header_expand_icon_size">-2px</dimen> @@ -719,7 +722,7 @@ <!-- The width of the protection of the face pile layout when expanded--> <dimen name="conversation_face_pile_protection_width_expanded">1dp</dimen> <!-- The padding of the expanded message container--> - <dimen name="expanded_group_conversation_message_padding">14dp</dimen> + <dimen name="expanded_group_conversation_message_padding">17dp</dimen> <!-- The stroke width of the ring used to visually mark a conversation as important --> <dimen name="importance_ring_stroke_width">2dp</dimen> <!-- The maximum stroke width used for the animation shown when a conversation is marked as important --> @@ -728,7 +731,7 @@ <dimen name="importance_ring_size">20dp</dimen> <!-- The top padding of the conversation icon container in the regular state--> - <dimen name="conversation_icon_container_top_padding">9dp</dimen> + <dimen name="conversation_icon_container_top_padding">12dp</dimen> <!-- The top padding of the conversation icon container when the avatar is small--> <dimen name="conversation_icon_container_top_padding_small_avatar">17.5dp</dimen> |