Merge "Fix a couple of mistakes with dots & summaries" into qt-r1-bubbles-dev (10cc5585) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -455,7 +455,8 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		NotificationEntry entry = mNotificationEntryManager.getNotificationData().get(key);
		String groupKey = entry != null ? entry.notification.getGroupKey() : null;
		boolean isSuppressedSummary = mBubbleData.isSummarySuppressed(groupKey);
		return isSuppressedSummary \|\| isBubbleAndSuppressed;
		boolean isSummary = key.equals(mBubbleData.getSummaryKey(groupKey));
		return (isSummary && isSuppressedSummary) \|\| isBubbleAndSuppressed;
		}

		void selectBubble(Bubble bubble) {
		@@ -731,10 +732,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		mBubbleData.removeSuppressedSummary(groupKey);
		NotificationEntry entry =
		mNotificationEntryManager.getNotificationData().get(notifKey);
		if (entry == null) {
		Log.w("mady", "WTF summary isn't in data... " + notifKey);
		return;
		}
		mNotificationEntryManager.performRemoveNotification(
		entry.notification, UNDEFINED_DISMISS_REASON);
		}
		@@ -745,7 +742,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		if (summary != null) {
		ArrayList<NotificationEntry> summaryChildren =
		mNotificationGroupManager.getLogicalChildren(summary.notification);
		if (summaryChildren == null \|\| summaryChildren.isEmpty()) {
		boolean isSummaryThisNotif = summary.key.equals(bubble.getEntry().key);
		if (!isSummaryThisNotif
		&& (summaryChildren == null \|\| summaryChildren.isEmpty())) {
		mNotificationEntryManager.performRemoveNotification(
		summary.notification, UNDEFINED_DISMISS_REASON);
		}

packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -268,7 +268,7 @@ public class BubbleView extends FrameLayout {
		iconPath.transform(matrix);
		mBadgedImageView.drawDot(iconPath);

		animateDot(mBubble.showInShadeWhenBubble() /* showDot /, null / after */);
		animateDot(mBubble.showBubbleDot() /* showDot /, null / after */);
		}

		int getBadgeColor() {