Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42db53c8 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[Notif redesign] Reduce headerless notif margins 

Bug: 378660052
Test: visual test, screenshot tests to come later
Flag: android.app.notifications_redesign_templates
Change-Id: Ic50a6fe93a976461243be1aa13dfcf72765a002a
parent d13755c9

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -5964,7 +5964,7 @@ public class Notification implements Parcelable 














        private static void setHeaderlessVerticalMargins(RemoteViews contentView,















                StandardTemplateParams p, boolean hasSecondLine) {













            if (!p.mHeaderless) {













            if (Flags.notificationsRedesignTemplates() || !p.mHeaderless) {















                return;















            }















            int marginDimen = hasSecondLine

































core/res/res/layout/notification_2025_template_collapsed_base.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -72,8 +72,8 @@













            android:layout_height="wrap_content"















            android:layout_gravity="center_vertical"















            android:layout_weight="1"













            android:layout_marginBottom="@dimen/notification_headerless_margin_twoline"













            android:layout_marginTop="@dimen/notification_headerless_margin_twoline"













            android:layout_marginBottom="@dimen/notification_2025_margin"













            android:layout_marginTop="@dimen/notification_2025_margin"















            android:orientation="vertical"















            >

















































core/res/res/layout/notification_2025_template_collapsed_call.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -44,7 +44,7 @@













            android:layout_marginStart="@dimen/conversation_content_start"















            android:orientation="vertical"















            android:minHeight="68dp"













            android:paddingBottom="@dimen/notification_headerless_margin_twoline"













            android:paddingBottom="@dimen/notification_2025_margin"















            >































            <include

































core/res/res/layout/notification_2025_template_collapsed_media.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -74,8 +74,8 @@













            android:layout_height="wrap_content"















            android:layout_gravity="center_vertical"















            android:layout_weight="1"













            android:layout_marginBottom="@dimen/notification_headerless_margin_twoline"













            android:layout_marginTop="@dimen/notification_headerless_margin_twoline"













            android:layout_marginBottom="@dimen/notification_2025_margin"













            android:layout_marginTop="@dimen/notification_2025_margin"















            android:orientation="vertical"















            >

















































core/res/res/layout/notification_2025_template_collapsed_messaging.xml



+2
−2




























Original line number
Diff line number
Diff line








@@ -98,8 +98,8 @@













                    android:layout_height="wrap_content"















                    android:layout_gravity="center_vertical"















                    android:layout_weight="1"













                    android:layout_marginBottom="@dimen/notification_headerless_margin_twoline"













                    android:layout_marginTop="@dimen/notification_headerless_margin_twoline"













                    android:layout_marginBottom="@dimen/notification_2025_margin"













                    android:layout_marginTop="@dimen/notification_2025_margin"















                    android:layout_marginStart="@dimen/notification_2025_content_margin_start"















                    android:clipChildren="false"















                    android:orientation="vertical"