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

Merge "Conversations UX polish pass" into rvc-dev am: 62a1b9d17e am: fe7e3019d2

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

Change-Id: I139dc32270c2000c81174d639b52dc0717a2cc2e
This commit is contained in:
TreeHugger Robot
2020-06-10 20:00:43 +00:00
committed by Automerger Merge Worker
parent 3d86863d75 fe7e3019d2
commit 305b4a8032
6 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/widget/ConversationLayout.java
View File

@@ -761,9 +761,13 @@ public class ConversationLayout extends FrameLayout
// group
: mExpandedGroupMessagePadding;
int iconPadding = mIsOneToOne || mIsCollapsed
? mConversationIconTopPadding
: mConversationIconTopPaddingExpandedGroup;
mConversationIconContainer.setPaddingRelative(
mConversationIconContainer.getPaddingStart(),
mConversationIconTopPadding,
iconPadding,
mConversationIconContainer.getPaddingEnd(),
mConversationIconContainer.getPaddingBottom());

4
core/res/res/layout/notification_template_material_conversation.xml
View File

@@ -148,7 +148,6 @@
android:layout_weight="1"
/>
<TextView
android:id="@+id/app_name_divider"
android:layout_width="wrap_content"
@@ -174,6 +173,7 @@
android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"
android:paddingTop="1sp"
android:singleLine="true"
android:visibility="gone"
/>
<TextView
@@ -192,7 +192,7 @@
<DateTimeView
android:id="@+id/time"
android:textAppearance="@style/TextAppearance.Material.Notification.Time"
android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
core/res/res/values/dimens.xml
View File

@@ -736,7 +736,7 @@
<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>
<dimen name="conversation_icon_container_top_padding_small_avatar">9dp</dimen>
<!-- The padding of the conversation header when expanded. This is calculated from the expand button size + notification_content_margin_end -->
<dimen name="conversation_header_expanded_padding_end">38dp</dimen>

7
core/res/res/values/styles_device_defaults.xml
View File

@@ -296,9 +296,12 @@ easier.
<style name="TextAppearance.DeviceDefault.Notification.Info" parent="TextAppearance.Material.Notification.Info">
<item name="fontFamily">@string/config_bodyFontFamily</item>
</style>
<style name="TextAppearance.DeviceDefault.Notification.Time" parent="TextAppearance.Material.Notification.Time">
<item name="fontFamily">@string/config_bodyFontFamily</item>
</style>
<style name="TextAppearance.DeviceDefault.Notification.Conversation.AppName"
parent="@*android:style/TextAppearance.DeviceDefault.Notification.Title">
<item name="android:textSize">16sp</item>
parent="TextAppearance.Material.Notification.Conversation.AppName">
<item name="fontFamily">@string/config_headlineFontFamilyMedium</item>
</style>
<style name="TextAppearance.DeviceDefault.Widget" parent="TextAppearance.Material.Widget">
<item name="fontFamily">@string/config_bodyFontFamily</item>

4
core/res/res/values/styles_material.xml
View File

@@ -491,6 +491,10 @@ please see styles_device_defaults.xml.
<item name="textColor">#66000000</item>
</style>
<style name="TextAppearance.Material.Notification.Conversation.AppName" parent="TextAppearance.Material.Notification.Title">
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.Material.ListItem" parent="TextAppearance.Material.Subhead" />
<style name="TextAppearance.Material.ListItemSecondary" parent="TextAppearance.Material.Body1" />

2
packages/SystemUI/res/layout/notification_conversation_info.xml
View File

@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:clipChildren="false"
android:paddingTop="8dp"
android:paddingTop="11dp"
android:clipToPadding="true">
<ImageView
android:id="@+id/conversation_icon"