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

Commit ad35f883 authored by Robert Snoeberger's avatar Robert Snoeberger
Browse files

Only help with HUNing notifications 

Fixes: 143290550
Test: Receive notification. Swipe away in shade. In java heap dump,
check that HeadsUpTouchHelper#mPickedChild isn't retaining the
ExpandableNotificationRow for the dismissed notification.

Change-Id: I46ff64d7c1c72eb8ae796daec699f7d34c9df0b8
parent b77d972a

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

+5 −2
Original line number Diff line number Diff line
@@ -77,9 +77,12 @@ public class HeadsUpTouchHelper implements Gefingerpoken { 
                ExpandableView child = mCallback.getChildAtRawPosition(x, y);

                mTouchingHeadsUpView = false;

                if (child instanceof ExpandableNotificationRow) {

                    mPickedChild = (ExpandableNotificationRow) child;

                    ExpandableNotificationRow pickedChild = (ExpandableNotificationRow) child;

                    mTouchingHeadsUpView = !mCallback.isExpanded()

                            && mPickedChild.isHeadsUp() && mPickedChild.isPinned();

                            && pickedChild.isHeadsUp() && pickedChild.isPinned();

                    if (mTouchingHeadsUpView) {

                        mPickedChild = pickedChild;

                    }

                } else if (child == null && !mCallback.isExpanded()) {

                    // We might touch above the visible heads up child, but then we still would

                    // like to capture it.