Merge "copy auto-group decisions to updates" into nyc-dev (facdf193) · Commits · e / os / android_frameworks_base

core/java/android/service/notification/StatusBarNotification.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -143,8 +143,18 @@ public class StatusBarNotification implements Parcelable {
		* Returns true if this notification is part of a group.
		*/
		public boolean isGroup() {
		if (overrideGroupKey != null \|\| getNotification().getGroup() != null
		\|\| getNotification().getSortKey() != null) {
		if (overrideGroupKey != null \|\| isAppGroup()) {
		return true;
		}
		return false;
		}

		/**
		* Returns true if application asked that this notification be part of a group.
		* @hide
		*/
		public boolean isAppGroup() {
		if (getNotification().getGroup() != null \|\| getNotification().getSortKey() != null) {
		return true;
		}
		return false;

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public final class Ranker extends NotificationRankerService {
		if (DEBUG) Log.i(TAG, "POSTED " + sbn.getKey());
		try {
		List<String> notificationsToBundle = new ArrayList<>();
		if (!sbn.isGroup()) {
		if (!sbn.isAppGroup()) {
		// Not grouped by the app, add to the list of notifications for the app;
		// send bundling update if app exceeds the autobundling limit.
		synchronized (mUnbundledNotifications) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -2948,7 +2948,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		public void topAppWindowChanged(boolean showMenu) {
		if (DEBUG) {
		if (SPEW) {
		Log.d(TAG, (showMenu?"showing":"hiding") + " the MENU button");
		}
		if (mNavigationBarView != null) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,9 @@ public final class NotificationRecord {
		mRankingTimeMs = calculateRankingTimeMs(previous.getRankingTimeMs());
		mCreationTimeMs = previous.mCreationTimeMs;
		mVisibleSinceMs = previous.mVisibleSinceMs;
		if(previous.sbn.getOverrideGroupKey() != null) {
		sbn.setOverrideGroupKey(previous.sbn.getOverrideGroupKey());
		}
		// Don't copy importance information or mGlobalSortKey, recompute them.
		}