Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Compress hybrid conversation layout" into rvc-dev am: 444d74fa39 am: 67afec2531

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11841229

Change-Id: I5a1b332636c577ded861facbaa7c6041a1f315e2
This commit is contained in:
TreeHugger Robot
2020-06-11 21:25:31 +00:00
committed by Automerger Merge Worker
parent 4559b44fa9 67afec2531
commit d966f25c4d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/res/layout/hybrid_conversation_notification.xml
View File

@@ -20,24 +20,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical|start" android:gravity="center_vertical|start"
android:paddingTop="1dp"
android:paddingBottom="1dp"
android:paddingEnd="12dp"> android:paddingEnd="12dp">
<FrameLayout <FrameLayout
android:layout_width="@*android:dimen/conversation_content_start" android:layout_width="@*android:dimen/conversation_content_start"
android:layout_height="36dp" android:layout_height="25dp"
> >
<ImageView <ImageView
android:id="@*android:id/conversation_icon" android:id="@*android:id/conversation_icon"
android:layout_width="24dp" android:layout_width="20dp"
android:layout_height="24dp" android:layout_height="20dp"
android:layout_gravity="center" android:layout_gravity="center"
/> />
<ViewStub <ViewStub
android:id="@*android:id/conversation_face_pile" android:id="@*android:id/conversation_face_pile"
android:layout="@*android:layout/conversation_face_pile_layout" android:layout="@*android:layout/conversation_face_pile_layout"
android:layout_width="36dp" android:layout_width="25dp"
android:layout_height="36dp" android:layout_height="25dp"
android:layout_gravity="center" android:layout_gravity="center"
/> />
</FrameLayout> </FrameLayout>

4
packages/SystemUI/res/values/dimens.xml
View File

@@ -631,10 +631,10 @@
<dimen name="notification_section_divider_height">@dimen/notification_side_paddings</dimen> <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 --> <!-- 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 --> <!-- 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 --> <!-- 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> <dimen name="conversation_single_line_face_pile_protection_width">1dp</dimen>