Merge "[Notif redesign] Fix broken expand animation in minimized groups" into main (21d23589) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -970,7 +970,9 @@ public class NotificationChildrenContainer extends ViewGroup
		if (mHeaderViewState != null) {
		mHeaderViewState.applyToView(mGroupHeader);
		}
		if (notificationsRedesignTemplates()) {
		// Only apply the special viewState for the header's children if we're not currently showing
		// the minimized header.
		if (notificationsRedesignTemplates() && !showingAsLowPriority()) {
		if (mTopLineViewState != null) {
		mTopLineViewState.applyToView(mGroupHeader.getTopLineView());
		}
		@@ -1236,14 +1238,12 @@ public class NotificationChildrenContainer extends ViewGroup
		}
		}

		private ViewGroup calculateDesiredHeader() {
		ViewGroup desiredHeader;
		private NotificationHeaderView calculateDesiredHeader() {
		if (showingAsLowPriority()) {
		desiredHeader = mMinimizedGroupHeader;
		return mMinimizedGroupHeader;
		} else {
		desiredHeader = mGroupHeader;
		return mGroupHeader;
		}
		return desiredHeader;
		}

		private void startChildAlphaAnimations(boolean toVisible) {