Merge changes I0ca13626,I3677ce54 into nyc-dev am: bbcb733d80 am: 20367dbd3b (9b1d30ee) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -873,7 +873,8 @@ public class NotificationStackScrollLayout extends ViewGroup
		ExpandableNotificationRow row = (ExpandableNotificationRow) child;
		ExpandableNotificationRow parent = row.getNotificationParent();
		if (parent != null && parent.areChildrenExpanded()
		&& (mGearExposedView == parent
		&& (parent.areGutsExposed()
		\|\| mGearExposedView == parent
		\|\| (parent.getNotificationChildren().size() == 1
		&& parent.isClearable()))) {
		// In this case the group is expanded and showing the gear for the
		@@ -961,6 +962,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		public boolean canChildBeExpanded(View v) {
		return v instanceof ExpandableNotificationRow
		&& ((ExpandableNotificationRow) v).isExpandable()
		&& !((ExpandableNotificationRow) v).areGutsExposed()
		&& (mIsExpanded \|\| !((ExpandableNotificationRow) v).isPinned());
		}

		@@ -2099,6 +2101,8 @@ public class NotificationStackScrollLayout extends ViewGroup
		final ExpandableView firstChild = getFirstChildNotGone();
		int firstChildMinHeight = firstChild != null
		? firstChild.getIntrinsicHeight()
		: mEmptyShadeView != null
		? mEmptyShadeView.getMinHeight()
		: mCollapsedSize;
		if (mOwnScrollY > 0) {
		firstChildMinHeight = Math.max(firstChildMinHeight - mOwnScrollY, mCollapsedSize);

+6 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,12 @@ public class StackScrollAlgorithm {
		}

		public static boolean canChildBeDismissed(View v) {
		if (v instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow row = (ExpandableNotificationRow) v;
		if (row.areGutsExposed()) {
		return false;
		}
		}
		final View veto = v.findViewById(R.id.veto);
		return (veto != null && veto.getVisibility() != View.GONE);
		}