Merge "Clicks on the notification group header now collapse" (a4c83f4c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,10 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater.
		} else if (row.isChildInGroup() && isMenuVisible(row.getNotificationParent())) {
		row.getNotificationParent().animateTranslateNotification(0);
		return;
		} else if (row.isSummaryWithChildren() && row.areChildrenExpanded()) {
		// We never want to open the app directly if the user clicks in between
		// the notifications.
		return;
		}

		// Mark notification for one frame.

+8 −0

Original line number	Diff line number	Diff line
		@@ -875,6 +875,7 @@ public class NotificationChildrenContainer extends ViewGroup {
		ExpandableNotificationRow child = mChildren.get(childIdx);
		child.setChildrenExpanded(childrenExpanded, false);
		}
		updateHeaderTouchability();
		}

		public void setContainingNotification(ExpandableNotificationRow parent) {
		@@ -1215,6 +1216,13 @@ public class NotificationChildrenContainer extends ViewGroup {
		ExpandableNotificationRow child = mChildren.get(i);
		child.setUserLocked(userLocked && !showingAsLowPriority());
		}
		updateHeaderTouchability();
		}

		private void updateHeaderTouchability() {
		if (mNotificationHeader != null) {
		mNotificationHeader.setAcceptAllTouches(mChildrenExpanded \|\| mUserLocked);
		}
		}

		public void onNotificationUpdated() {