Merge "Collapse all groups now when the shade is collapsed" (b5e6af5f) · Commits · e / os / android_frameworks_base

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -154,13 +154,17 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged
		}
		mBarState = newState;
		if (mBarState == StatusBarState.KEYGUARD) {
		collapseAllGroups();
		}
		}

		public void collapseAllGroups() {
		for (NotificationGroup group : mGroupMap.values()) {
		if (group.expanded) {
		setGroupExpanded(group, false);
		}
		}
		}
		}

		/**
		* @return whether a given notification is a child in a group which has a summary

+3 −0

Original line number	Diff line number	Diff line
		@@ -2605,6 +2605,9 @@ public class NotificationStackScrollLayout extends ViewGroup
		mIsExpanded = isExpanded;
		mStackScrollAlgorithm.setIsExpanded(isExpanded);
		if (changed) {
		if (!mIsExpanded) {
		mGroupManager.collapseAllGroups();
		}
		updateNotificationAnimationStates();
		updateChronometers();
		}