Merge "Allow alertOverride if the summary GROUP_ALERT_ALL" into sc-v2-dev (7be75566) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/legacy/NotificationGroupManagerLegacy.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -384,9 +384,9 @@ public class NotificationGroupManagerLegacy implements
		// * Only necessary when all notifications in the group use GROUP_ALERT_SUMMARY
		// * Only necessary when at least one notification in the group is on a priority channel
		if (group.summary.getSbn().getNotification().getGroupAlertBehavior()
		!= Notification.GROUP_ALERT_SUMMARY) {
		== Notification.GROUP_ALERT_CHILDREN) {
		if (SPEW) {
		Log.d(TAG, "getPriorityConversationAlertOverride: summary != GROUP_ALERT_SUMMARY");
		Log.d(TAG, "getPriorityConversationAlertOverride: summary == GROUP_ALERT_CHILDREN");
		}
		return null;
		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationGroupManagerLegacyTest.java

+61 −5

Original line number	Diff line number	Diff line
		@@ -177,21 +177,69 @@ public class NotificationGroupManagerLegacyTest extends SysuiTestCase {
		helpTestAlertOverrideWithSiblings(2);
		}

		/**
		* Helper for testing various sibling counts
		*/
		private void helpTestAlertOverrideWithSiblings(int numSiblings) {
		helpTestAlertOverride(
		/* numSiblings */ numSiblings,
		/* summaryAlert */ Notification.GROUP_ALERT_SUMMARY,
		/* childAlert */ Notification.GROUP_ALERT_SUMMARY,
		/* siblingAlert */ Notification.GROUP_ALERT_SUMMARY,
		/* expectAlertOverride */ true);
		}

		@Test
		public void testAlertOverrideWithParentAlertAll() {
		// tests that summary can have GROUP_ALERT_ALL and this still works
		helpTestAlertOverride(
		/* numSiblings */ 1,
		/* summaryAlert */ Notification.GROUP_ALERT_ALL,
		/* childAlert */ Notification.GROUP_ALERT_SUMMARY,
		/* siblingAlert */ Notification.GROUP_ALERT_SUMMARY,
		/* expectAlertOverride */ true);
		}

		@Test
		public void testAlertOverrideWithParentAlertChild() {
		// Tests that if the summary alerts CHILDREN, there's no alertOverride
		helpTestAlertOverride(
		/* numSiblings */ 1,
		/* summaryAlert */ Notification.GROUP_ALERT_CHILDREN,
		/* childAlert */ Notification.GROUP_ALERT_SUMMARY,
		/* siblingAlert */ Notification.GROUP_ALERT_SUMMARY,
		/* expectAlertOverride */ false);
		}

		@Test
		public void testAlertOverrideWithChildrenAlertAll() {
		// Tests that if the children alert ALL, there's no alertOverride
		helpTestAlertOverride(
		/* numSiblings */ 1,
		/* summaryAlert */ Notification.GROUP_ALERT_SUMMARY,
		/* childAlert */ Notification.GROUP_ALERT_ALL,
		/* siblingAlert */ Notification.GROUP_ALERT_ALL,
		/* expectAlertOverride */ false);
		}

		/**
		* This tests, for a group with a priority entry and the given number of siblings, that:
		* 1) the priority entry is identified as the alertOverride for the group
		* 2) the onAlertOverrideChanged method is called at that time
		* 3) when the priority entry is removed, these are reversed
		*/
		private void helpTestAlertOverrideWithSiblings(int numSiblings) {
		int groupAlert = Notification.GROUP_ALERT_SUMMARY;
		private void helpTestAlertOverride(int numSiblings,
		@Notification.GroupAlertBehavior int summaryAlert,
		@Notification.GroupAlertBehavior int childAlert,
		@Notification.GroupAlertBehavior int siblingAlert,
		boolean expectAlertOverride) {
		// Create entries in an order so that the priority entry can be deemed the newest child.
		NotificationEntry[] siblings = new NotificationEntry[numSiblings];
		for (int i = 0; i < numSiblings; i++) {
		siblings[i] = mGroupTestHelper.createChildNotification(groupAlert);
		siblings[i] = mGroupTestHelper.createChildNotification(siblingAlert);
		}
		NotificationEntry priorityEntry = mGroupTestHelper.createChildNotification(groupAlert);
		NotificationEntry summaryEntry = mGroupTestHelper.createSummaryNotification(groupAlert);
		NotificationEntry priorityEntry = mGroupTestHelper.createChildNotification(childAlert);
		NotificationEntry summaryEntry = mGroupTestHelper.createSummaryNotification(summaryAlert);

		// The priority entry is an important conversation.
		when(mPeopleNotificationIdentifier.getPeopleNotificationType(eq(priorityEntry)))
		@@ -208,6 +256,14 @@ public class NotificationGroupManagerLegacyTest extends SysuiTestCase {
		}
		mGroupManager.onEntryAdded(priorityEntry);

		if (!expectAlertOverride) {
		// Test expectation is that there will NOT be an alert, so verify that!
		NotificationGroup summaryGroup =
		mGroupManager.getGroupForSummary(summaryEntry.getSbn());
		assertNull(summaryGroup.alertOverride);
		return;
		}

		// Verify that the summary group has the priority child as its alertOverride
		NotificationGroup summaryGroup = mGroupManager.getGroupForSummary(summaryEntry.getSbn());
		assertEquals(priorityEntry, summaryGroup.alertOverride);