summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-11 21:04:44 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-06-11 21:04:44 +0000
commit444d74fa396cbde0d7395e5af37e110ffe736ef8 (patch)
tree54f0b4e2868f4fac43f28c6fa36215256741df72
parent0401e33f74138422fc55495d34dc754edac26f2f (diff)
parent61b1185b6ff35b73ae08608be93a0ece43444b82 (diff)
Merge "Compress hybrid conversation layout" into rvc-dev
-rw-r--r--packages/SystemUI/res/layout/hybrid_conversation_notification.xml12
-rw-r--r--packages/SystemUI/res/values/dimens.xml4
2 files changed, 9 insertions, 7 deletions
diff --git a/packages/SystemUI/res/layout/hybrid_conversation_notification.xml b/packages/SystemUI/res/layout/hybrid_conversation_notification.xml
index 21a671cf9d5a..214c44a41c5c 100644
--- a/packages/SystemUI/res/layout/hybrid_conversation_notification.xml
+++ b/packages/SystemUI/res/layout/hybrid_conversation_notification.xml
@@ -20,24 +20,26 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|start"
+ android:paddingTop="1dp"
+ android:paddingBottom="1dp"
android:paddingEnd="12dp">
<FrameLayout
android:layout_width="@*android:dimen/conversation_content_start"
- android:layout_height="36dp"
+ android:layout_height="25dp"
>
<ImageView
android:id="@*android:id/conversation_icon"
- android:layout_width="24dp"
- android:layout_height="24dp"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
android:layout_gravity="center"
/>
<ViewStub
android:id="@*android:id/conversation_face_pile"
android:layout="@*android:layout/conversation_face_pile_layout"
- android:layout_width="36dp"
- android:layout_height="36dp"
+ android:layout_width="25dp"
+ android:layout_height="25dp"
android:layout_gravity="center"
/>
</FrameLayout>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index abc560bed595..44d3b02f0db7 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -631,10 +631,10 @@
<dimen name="notification_section_divider_height">@dimen/notification_side_paddings</dimen>
<!-- Size of the face pile shown on one-line (children of a group) conversation notifications -->
- <dimen name="conversation_single_line_face_pile_size">36dp</dimen>
+ <dimen name="conversation_single_line_face_pile_size">25dp</dimen>
<!-- Size of an avatar shown on one-line (children of a group) conversation notifications -->
- <dimen name="conversation_single_line_avatar_size">24dp</dimen>
+ <dimen name="conversation_single_line_avatar_size">20dp</dimen>
<!-- Border width for avatars in the face pile shown on one-line (children of a group) conversation notifications -->
<dimen name="conversation_single_line_face_pile_protection_width">1dp</dimen>