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

Commit 905af16a authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed some notification leaks"

parents 8b0813c3 f306d9b4

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

+2 −0
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ public class ExpandHelper implements Gefingerpoken { 
                public void onAnimationEnd(Animator animation) {

                    if (!mCancelled) {

                        mCallback.setUserExpandedChild(scaledView, expand);

                        mScaler.setView(null);

                    } else {

                        mCallback.setExpansionCancelled(scaledView);

                    }
@@ -592,6 +593,7 @@ public class ExpandHelper implements Gefingerpoken { 
            }

            mCallback.setUserExpandedChild(mResizedView, nowExpanded);

            mCallback.setUserLockedChild(mResizedView, false);

            mScaler.setView(null);

        }



        mExpanding = false;

packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ public class DragDownHelper implements Gefingerpoken { 
                        mDragDownCallback.setEmptyDragAmount(0f);

                    } else {

                        mCallback.setUserLockedChild(mStartingChild, false);

                        mStartingChild = null;

                    }

                    mDraggingDown = false;

                } else {
@@ -214,6 +215,7 @@ public class DragDownHelper implements Gefingerpoken { 
        mFalsingManager.onNotificatonStopDraggingDown();

        if (mStartingChild != null) {

            cancelExpansion(mStartingChild);

            mStartingChild = null;

        } else {

            cancelExpansion();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -2814,7 +2814,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
            }

            mNeedsAnimation = true;

        }

        if (isHeadsUp(child) && !mChangePositionInProgress) {

        if (isHeadsUp(child) && mAnimationsEnabled && !mChangePositionInProgress) {

            mAddedHeadsUpChildren.add(child);

            mChildrenToAddAnimated.remove(child);

        }