From eb145298311d05157f85c4fe50e4b8d5d13a7775 Mon Sep 17 00:00:00 2001
From: Johannes Gallmann <gallmann@google.com>
Date: Tue, 18 Oct 2022 09:29:56 +0000
Subject: [PATCH] Revert "Fix notification group dismissal fade animation"

This reverts commit 01397a7825bba7e536dab2788e9658fbb4c22aad.

Reason for revert: Apparently, this change made the SystemServerTiming_PhaseActivityManagerReady-mean test time increase by 12.7%. Therefore, I want to revert it until I figure out, what is causing this increase.

Bug: 253532643

Change-Id: I347c865ab791ba1fc20bf03a34d9a8f2a5ce60ce
---
 .../row/ExpandableNotificationRow.java             |  2 +-
 .../stack/NotificationChildrenContainer.java       | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
index 74cc58c91f515..07ed0135bf6e3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
@@ -1487,7 +1487,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
             l.setAlpha(alpha);
         }
         if (mChildrenContainer != null) {
-            mChildrenContainer.setContentAlpha(alpha);
+            mChildrenContainer.setAlpha(alpha);
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
index 4ba22d08eef28..d77e03fd043d9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java
@@ -461,20 +461,6 @@ public class NotificationChildrenContainer extends ViewGroup
         return mAttachedChildren;
     }
 
-    /**
-     * Sets the alpha on the content, while leaving the background of the container itself as is.
-     *
-     * @param alpha alpha value to apply to the content
-     */
-    public void setContentAlpha(float alpha) {
-        for (int i = 0; i < mNotificationHeader.getChildCount(); i++) {
-            mNotificationHeader.getChildAt(i).setAlpha(alpha);
-        }
-        for (ExpandableNotificationRow child : getAttachedChildren()) {
-            child.setContentAlpha(alpha);
-        }
-    }
-
     /** To be called any time the rows have been updated */
     public void updateExpansionStates() {
         if (mChildrenExpanded || mUserLocked) {