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

Commit 988ef15c authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a bug where a removed notification would stick around" into oc-mr1-dev 

am: ba55894e

Change-Id: If767d72496dbabb59cb500e2763928f7a21198bc
parents 004f9a30 ba55894e

packages/SystemUI/src/com/android/systemui/SwipeHelper.java

+6 −1
Original line number Diff line number Diff line
@@ -439,7 +439,12 @@ public class SwipeHelper implements Gefingerpoken { 
            public void onAnimationEnd(Animator animation) {

                updateSwipeProgressFromOffset(animView, canBeDismissed);

                mDismissPendingMap.remove(animView);

                if (!mCancelled) {

                boolean wasRemoved = false;

                if (animView instanceof ExpandableNotificationRow) {

                    ExpandableNotificationRow row = (ExpandableNotificationRow) animView;

                    wasRemoved = row.isRemoved();

                }

                if (!mCancelled || wasRemoved) {

                    mCallback.onChildDismissed(animView);

                }

                if (endAction != null) {

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+4 −1
Original line number Diff line number Diff line
@@ -4539,7 +4539,10 @@ public class NotificationStackScrollLayout extends ViewGroup 
                    anim.start();

                }

            } else if (mMenuExposedView instanceof ExpandableNotificationRow) {

                ((ExpandableNotificationRow) mMenuExposedView).resetTranslation();

                ExpandableNotificationRow row = (ExpandableNotificationRow) mMenuExposedView;

                if (!row.isRemoved()) {

                    row.resetTranslation();

                }

            }

            mMenuExposedView = null;

        }