diff options
| author | 2020-09-09 16:21:28 +0100 | |
|---|---|---|
| committer | 2020-09-22 17:15:53 +0100 | |
| commit | 36a861b21ccf5dd8858f4100014ffe69b46e92a0 (patch) | |
| tree | c52b381b79a2a9b24d726d38c0d22a6f03032387 | |
| parent | b4ada7780762f6f450ce153217da9f4bbc08700b (diff) | |
Remove extra padding between Notification header and inline_controls
- Make header in notification_info / partial_conversation_info
wrap_content, same way that notification_conversation_info does, add
add a 11dp padding at top of the header
Test: Manual (See Bug)
Bug: 153886426
Change-Id: If57ce8d3c2badf8d7a80e7396f5bb8f1b3605ebc
4 files changed, 9 insertions, 5 deletions
diff --git a/packages/SystemUI/res/layout/notification_conversation_info.xml b/packages/SystemUI/res/layout/notification_conversation_info.xml index fd89c0bf39dd..10ad8291636e 100644 --- a/packages/SystemUI/res/layout/notification_conversation_info.xml +++ b/packages/SystemUI/res/layout/notification_conversation_info.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:clipChildren="false" - android:paddingTop="11dp" + android:paddingTop="@dimen/notification_guts_header_top_padding" android:clipToPadding="true"> <ImageView android:id="@+id/conversation_icon" diff --git a/packages/SystemUI/res/layout/notification_info.xml b/packages/SystemUI/res/layout/notification_info.xml index 92b3ff335cba..0a33d5e4429b 100644 --- a/packages/SystemUI/res/layout/notification_info.xml +++ b/packages/SystemUI/res/layout/notification_info.xml @@ -30,10 +30,11 @@ <LinearLayout android:id="@+id/header" android:layout_width="match_parent" - android:layout_height="@dimen/notification_guts_conversation_header_height" + android:layout_height="wrap_content" android:gravity="center_vertical" android:clipChildren="false" - android:clipToPadding="false"> + android:paddingTop="@dimen/notification_guts_header_top_padding" + android:clipToPadding="true"> <ImageView android:id="@+id/pkg_icon" android:layout_width="@dimen/notification_guts_conversation_icon_size" diff --git a/packages/SystemUI/res/layout/partial_conversation_info.xml b/packages/SystemUI/res/layout/partial_conversation_info.xml index c353d089895c..af66f8ba4cd6 100644 --- a/packages/SystemUI/res/layout/partial_conversation_info.xml +++ b/packages/SystemUI/res/layout/partial_conversation_info.xml @@ -30,10 +30,11 @@ <LinearLayout android:id="@+id/header" android:layout_width="match_parent" - android:layout_height="@dimen/notification_guts_conversation_header_height" + android:layout_height="wrap_content" android:gravity="center_vertical" android:clipChildren="false" - android:clipToPadding="false"> + android:paddingTop="@dimen/notification_guts_header_top_padding" + android:clipToPadding="true"> <ImageView android:id="@+id/icon" android:layout_width="@dimen/notification_guts_conversation_icon_size" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 98e8cde40275..4f26226c11b6 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -226,6 +226,8 @@ <dimen name="notification_guts_conversation_action_text_padding_start">32dp</dimen> <dimen name="conversation_onboarding_bullet_gap_width">6dp</dimen> + <dimen name="notification_guts_header_top_padding">11dp</dimen> + <!-- The height of the header in inline settings --> <dimen name="notification_guts_header_height">24dp</dimen> |