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

Commit 2b542424 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a crash with notification children 

Notification children would animate when removed even
though they were just transferring to a different parent
or to the root.

Bug: 27476798
Change-Id: I97eb6e795d7762fb150b63f49eec9bb6092339be
parent 50c6e498

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

+38 −30
Original line number Diff line number Diff line
@@ -1477,6 +1477,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            mStackScroller.removeView(remove);

            mStackScroller.setChildTransferInProgress(false);

        }



        removeNotificationChildren();



        for (int i=0; i<toShow.size(); i++) {

            View v = toShow.get(i);

            if (v.getParent() == null) {
@@ -1484,6 +1487,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            }

        }



        addNotificationChildrenAndSort();



        // So after all this work notifications still aren't sorted correctly.

        // Let's do that now by advancing through toShow and mStackScroller in

        // lock-step, making sure mStackScroller matches what we see in toShow.
@@ -1505,9 +1510,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 


        }



        // lets handle the child notifications now

        updateNotificationShadeForChildren();



        // clear the map again for the next usage

        mTmpChildOrderMap.clear();
@@ -1533,9 +1535,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                && !ONLY_CORE_APPS);

    }



    private void updateNotificationShadeForChildren() {

        // First let's remove all children which don't belong in the parents

        ArrayList<ExpandableNotificationRow> toRemove = new ArrayList<>();

    private void addNotificationChildrenAndSort() {

        // Let's now add all notification children which are missing

        boolean orderChanged = false;

        for (int i = 0; i < mStackScroller.getChildCount(); i++) {

            View view = mStackScroller.getChildAt(i);

            if (!(view instanceof ExpandableNotificationRow)) {
@@ -1547,22 +1549,26 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            List<ExpandableNotificationRow> children = parent.getNotificationChildren();

            List<ExpandableNotificationRow> orderedChildren = mTmpChildOrderMap.get(parent);



            if (children != null) {

                toRemove.clear();

                for (ExpandableNotificationRow childRow : children) {

                    if (orderedChildren == null || !orderedChildren.contains(childRow)) {

                        toRemove.add(childRow);

            for (int childIndex = 0; orderedChildren != null && childIndex < orderedChildren.size();

                    childIndex++) {

                ExpandableNotificationRow childView = orderedChildren.get(childIndex);

                if (children == null || !children.contains(childView)) {

                    parent.addChildNotification(childView, childIndex);

                    mStackScroller.notifyGroupChildAdded(childView);

                }

            }

                for (ExpandableNotificationRow remove : toRemove) {

                    parent.removeChildNotification(remove);

                    mStackScroller.notifyGroupChildRemoved(remove);



            // Finally after removing and adding has been beformed we can apply the order.

            orderChanged |= parent.applyChildOrder(orderedChildren);

        }

        if (orderChanged) {

            mStackScroller.generateChildOrderChangedEvent();

        }

    }



        // Let's now add all notification children which are missing

        boolean orderChanged = false;

    private void removeNotificationChildren() {

        // First let's remove all children which don't belong in the parents

        ArrayList<ExpandableNotificationRow> toRemove = new ArrayList<>();

        for (int i = 0; i < mStackScroller.getChildCount(); i++) {

            View view = mStackScroller.getChildAt(i);

            if (!(view instanceof ExpandableNotificationRow)) {
@@ -1574,20 +1580,22 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            List<ExpandableNotificationRow> children = parent.getNotificationChildren();

            List<ExpandableNotificationRow> orderedChildren = mTmpChildOrderMap.get(parent);



            for (int childIndex = 0; orderedChildren != null && childIndex < orderedChildren.size();

                    childIndex++) {

                ExpandableNotificationRow childView = orderedChildren.get(childIndex);

                if (children == null || !children.contains(childView)) {

                    parent.addChildNotification(childView, childIndex);

                    mStackScroller.notifyGroupChildAdded(childView);

            if (children != null) {

                toRemove.clear();

                for (ExpandableNotificationRow childRow : children) {

                    if (orderedChildren == null || !orderedChildren.contains(childRow)) {

                        toRemove.add(childRow);

                    }

                }

                for (ExpandableNotificationRow remove : toRemove) {

                    parent.removeChildNotification(remove);

                    if (mNotificationData.get(remove.getStatusBarNotification().getKey()) == null) {

                        // We only want to add an animation if the view is completely removed

                        // otherwise it's just a transfer

                        mStackScroller.notifyGroupChildRemoved(remove);

                    }

                }



            // Finally after removing and adding has been beformed we can apply the order.

            orderChanged |= parent.applyChildOrder(orderedChildren);

            }

        if (orderChanged) {

            mStackScroller.generateChildOrderChangedEvent();

        }

    }