0001-NotificationHeaderViewWrapper-let-conversation-heade.patch

From 1ed5b616eb584b252a7e189e1208ecb5e419c2e0 Mon Sep 17 00:00:00 2001
From: Dil3mm4 <dil3mm4.dev@gmail.com>
Date: Wed, 4 Nov 2020 14:13:04 +0000
Subject: [PATCH] NotificationHeaderViewWrapper: let conversation headers be
 compliant with other notification ones


diff --git a/packages/SystemUI/res/layout/hybrid_conversation_notification.xml b/packages/SystemUI/res/layout/hybrid_conversation_notification.xml
index 214c44a41c5..302812a79bc 100644
--- a/packages/SystemUI/res/layout/hybrid_conversation_notification.xml
+++ b/packages/SystemUI/res/layout/hybrid_conversation_notification.xml
@@ -25,14 +25,16 @@
     android:paddingEnd="12dp">
 
     <FrameLayout
-        android:layout_width="@*android:dimen/conversation_content_start"
+        android:layout_width="wrap_content"
+        android:paddingStart="14dp"
+        android:paddingEnd="8dp"
         android:layout_height="25dp"
     >
         <ImageView
             android:id="@*android:id/conversation_icon"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:layout_gravity="center"
+            android:layout_gravity="start|center_vertical"
         />
 
         <ViewStub
@@ -40,7 +42,7 @@
             android:layout="@*android:layout/conversation_face_pile_layout"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            android:layout_gravity="center"
+            android:layout_gravity="start|center_vertical"
         />
     </FrameLayout>
 
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 331e359d2ee..fdc6d65fe49 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -607,7 +607,7 @@
     <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">25dp</dimen>
+    <dimen name="conversation_single_line_face_pile_size">20dp</dimen>
 
     <!-- Size of an avatar shown on one-line (children of a group) conversation notifications -->
     <dimen name="conversation_single_line_avatar_size">20dp</dimen>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java
index 51bdb8e9c9a..800b0d95379 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java
@@ -204,6 +204,8 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {
     }
 
     public void applyConversationSkin() {
+        //since we don't want this anymore...
+        /*
         if (mAppNameText != null) {
             mAppNameText.setTextAppearance(
                     com.android.internal.R.style
@@ -227,7 +229,7 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {
             ViewGroup.MarginLayoutParams layoutParams =
                     (ViewGroup.MarginLayoutParams) mIcon.getLayoutParams();
             layoutParams.setMarginEnd(0);
-        }
+        }*/
     }
 
     public void clearConversationSkin() {
-- 
2.20.1