Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "copy auto-group decisions to updates" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-03 20:08:01 +00:00
committed by Android (Google) Code Review
parent a31657911c 8a1638f66a
commit facdf19313
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/service/notification/StatusBarNotification.java
View File

@@ -143,8 +143,18 @@ public class StatusBarNotification implements Parcelable {
* Returns true if this notification is part of a group. * Returns true if this notification is part of a group.
*/ */
public boolean isGroup() { public boolean isGroup() {
if (overrideGroupKey != null || getNotification().getGroup() != null if (overrideGroupKey != null || isAppGroup()) {
|| getNotification().getSortKey() != null) { 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 true;
} }
return false; return false;

2
packages/ExtServices/src/android/ext/services/notification/Ranker.java
View File

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

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -2948,7 +2948,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
public void topAppWindowChanged(boolean showMenu) { public void topAppWindowChanged(boolean showMenu) {
if (DEBUG) { if (SPEW) {
Log.d(TAG, (showMenu?"showing":"hiding") + " the MENU button"); Log.d(TAG, (showMenu?"showing":"hiding") + " the MENU button");
} }
if (mNavigationBarView != null) { if (mNavigationBarView != null) {

3
services/core/java/com/android/server/notification/NotificationRecord.java
View File

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