Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a1638f6 authored by Chris Wren's avatar Chris Wren
Browse files

copy auto-group decisions to updates 

The rocket runs too late to affect auto-grouping for updates before
the UI reacts to the group change, so make sure it stays the same
until the rocket has an opportunity to reconsider.

Bug: 28517296
Change-Id: I16a0509cac06912c8b3139f06474f312207f9f8c
parent dbe2dbae

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;

packages/ExtServices/src/android/ext/services/notification/Ranker.java

+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) {

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

+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) {

services/core/java/com/android/server/notification/NotificationRecord.java

+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.

    }