Merge "Fixed a bug where expanding in the bottom stack messed up the whole layout" into nyc-dev (53c9fa98) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -2730,13 +2730,13 @@ public class NotificationStackScrollLayout extends ViewGroup
		if (view instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow row = (ExpandableNotificationRow) view;
		if (row.isUserLocked() && row != getFirstChildNotGone()) {
		if (row.isSummaryWithChildren()) {
		return;
		}
		// We are actually expanding this view
		float endPosition;
		float endPosition = row.getTranslationY() + row.getActualHeight();
		if (row.isChildInGroup()) {
		ExpandableNotificationRow parent = row.getNotificationParent();
		endPosition = parent.getTranslationY() + parent.getActualHeight();
		} else {
		endPosition = row.getTranslationY() + row.getActualHeight();
		endPosition += row.getNotificationParent().getTranslationY();
		}
		int stackEnd = mMaxLayoutHeight - mBottomStackPeekSize -
		mBottomStackSlowDownHeight + (int) mStackTranslation;