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

Commit 3f08d749 authored May 15, 2024 by Yining Liu Committed by Android (Google) Code Review May 15, 2024

Merge "Fix the expander regression with async inflation" into main

parents 984999f0 d956ce02

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -590,7 +590,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		mMenuRow.setAppName(mAppName);
		}
		if (mIsSummaryWithChildren) {
		if (!AsyncGroupHeaderViewInflation.isEnabled()) {
		if (AsyncGroupHeaderViewInflation.isEnabled()) {
		mChildrenContainer.updateGroupHeaderExpandState();
		} else {
		// We create the header from the background thread instead
		mChildrenContainer.recreateNotificationHeader(mExpandClickListener,
		isConversation());

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -439,6 +439,15 @@ public class NotificationChildrenContainer extends ViewGroup
		Trace.endSection();
		}

		/**
		* Update the expand state of the group header.
		*/
		public void updateGroupHeaderExpandState() {
		if (mGroupHeaderWrapper != null) {
		mGroupHeaderWrapper.setExpanded(mChildrenExpanded);
		}
		}

		private void removeGroupHeader() {
		if (mGroupHeader == null) {
		return;