Merge "Fix lockscreen notification + media counting." into sc-dev (6c9c6cb6) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -2097,11 +2097,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		if (height != 0) {
		height += mPaddingBetweenElements;
		}
		height += calculateGapHeight(previousView, expandableView, numShownItems);
		float gapHeight = calculateGapHeight(previousView, expandableView, numShownNotifs);
		height += gapHeight;
		height += viewHeight;

		numShownItems++;
		if (!(expandableView instanceof MediaHeaderView)) {
		if (viewHeight > 0 \|\| !(expandableView instanceof MediaHeaderView)) {
		// Only count the media as a notification if it has a positive height.
		numShownNotifs++;
		}
		previousView = expandableView;

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+22 −15

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
		import com.android.systemui.statusbar.notification.row.ExpandableView;
		import com.android.systemui.statusbar.notification.stack.AmbientState;
		import com.android.systemui.statusbar.notification.stack.AnimationProperties;
		import com.android.systemui.statusbar.notification.stack.MediaHeaderView;
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;
		import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
		@@ -1325,14 +1326,10 @@ public class NotificationPanelViewController extends PanelViewController {
		ExpandableView previousView = null;
		for (int i = 0; i < mNotificationStackScrollLayoutController.getChildCount(); i++) {
		ExpandableView child = mNotificationStackScrollLayoutController.getChildAt(i);
		if (!(child instanceof ExpandableNotificationRow)) {
		continue;
		}
		if (child instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow row = (ExpandableNotificationRow) child;
		boolean
		suppressedSummary =
		mGroupManager != null && mGroupManager.isSummaryOfSuppressedGroup(
		row.getEntry().getSbn());
		boolean suppressedSummary = mGroupManager != null
		&& mGroupManager.isSummaryOfSuppressedGroup(row.getEntry().getSbn());
		if (suppressedSummary) {
		continue;
		}
		@@ -1342,6 +1339,16 @@ public class NotificationPanelViewController extends PanelViewController {
		if (row.isRemoved()) {
		continue;
		}
		} else if (child instanceof MediaHeaderView) {
		if (child.getVisibility() == GONE) {
		continue;
		}
		if (child.getIntrinsicHeight() == 0) {
		continue;
		}
		} else {
		continue;
		}
		availableSpace -= child.getMinHeight(true /* ignoreTemporaryStates */);
		availableSpace -= count == 0 ? 0 : notificationPadding;
		availableSpace -= mNotificationStackScrollLayoutController