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

Commit 5243c12f authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a bug where a notification could stay userlocked 

Moved the responsibility to remove the userlocked flag
into the DragdownHelper instead of the Callback.

Bug: 24866646
Change-Id: Ib0dbe310f9f7637f9bae466b1029728a6611f291
parent 2d3c59c3

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

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,8 @@ public class DragDownHelper implements Gefingerpoken { 
                        (int) (y - mInitialTouchY))) {

                    if (mStartingChild == null) {

                        mDragDownCallback.setEmptyDragAmount(0f);

                    } else {

                        mCallback.setUserLockedChild(mStartingChild, false);

                    }

                    mDraggingDown = false;

                } else {
@@ -180,6 +182,7 @@ public class DragDownHelper implements Gefingerpoken { 


    private void cancelExpansion(final ExpandableView child) {

        if (child.getContentHeight() == child.getMinHeight()) {

            mCallback.setUserLockedChild(child, false);

            return;

        }

        ObjectAnimator anim = ObjectAnimator.ofInt(child, "contentHeight",

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

+0 −3
Original line number Diff line number Diff line
@@ -3986,9 +3986,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            mNotificationPanel.animateToFullShade(0 /* delay */);

            setBarState(StatusBarState.SHADE_LOCKED);

            updateKeyguardState(false /* goingToFullShade */, false /* fromShadeLocked */);

            if (row != null) {

                row.setUserLocked(false);

            }

        }

    }