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

Commit e0640dd5 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Allow closing the whole panel when QS is open 

If the user drags below the notifications, we close everything. Only
implemented for the SHADE, and not on Keyguard because of
time constraints.

Bug: 15414856
Change-Id: I4cf656484bc1217d552211c2bfdd7598eb52dad7
parent 28f0e593

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

+25 −8
Original line number Diff line number Diff line
@@ -450,8 +450,14 @@ public class NotificationPanelView extends PanelView implements 
                mIntercepting = false;

                break;

        }



        // Allow closing the whole panel when in SHADE state.

        if (mStatusBarState == StatusBarState.SHADE) {

            return super.onInterceptTouchEvent(event);

        } else {

            return !mQsExpanded && super.onInterceptTouchEvent(event);

        }

    }



    private void resetDownStates(MotionEvent event) {

        if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
@@ -503,7 +509,7 @@ public class NotificationPanelView extends PanelView implements 
            return true;

        }

        if (event.getActionMasked() == MotionEvent.ACTION_DOWN && getExpandedFraction() == 1f

                && mStatusBar.getBarState() != StatusBarState.KEYGUARD) {

                && mStatusBar.getBarState() != StatusBarState.KEYGUARD && !mQsExpanded) {



            // Down in the empty area while fully expanded - go to QS.

            mQsTracking = true;
@@ -516,7 +522,7 @@ public class NotificationPanelView extends PanelView implements 
        if (mExpandedHeight != 0) {

            handleQsDown(event);

        }

        if (!mTwoFingerQsExpand && (mQsTracking || mQsExpanded)) {

        if (!mTwoFingerQsExpand && mQsTracking) {

            onQsTouch(event);

            if (!mConflictingQsExpansionGesture) {

                return true;
@@ -539,9 +545,15 @@ public class NotificationPanelView extends PanelView implements 
        return true;

    }



    private boolean isInQsArea(float x, float y) {

        return mStatusBarState != StatusBarState.SHADE

                || y <= mNotificationStackScroller.getBottomMostNotificationBottom()

                || y <= mQsContainer.getY() + mQsContainer.getHeight();

    }



    private void handleQsDown(MotionEvent event) {

        if (event.getActionMasked() == MotionEvent.ACTION_DOWN

                && shouldQuickSettingsIntercept(event.getX(), event.getY(), 0)) {

                && shouldQuickSettingsIntercept(event.getX(), event.getY(), -1)) {

            mQsTracking = true;

            onQsExpansionStarted();

            mInitialHeightOnTouch = mQsExpansionHeight;
@@ -627,8 +639,9 @@ public class NotificationPanelView extends PanelView implements 
    }



    @Override

    public void onOverscrolled(int amount) {

        if (mIntercepting) {

    public void onOverscrolled(float lastTouchX, float lastTouchY, int amount) {

        if (mIntercepting && shouldQuickSettingsIntercept(lastTouchX, lastTouchY,

                -1 /* yDiff: Not relevant here */)) {

            onQsExpansionStarted(amount);

            mInitialHeightOnTouch = mQsExpansionHeight;

            mInitialTouchY = mLastTouchY;
@@ -1037,7 +1050,7 @@ public class NotificationPanelView extends PanelView implements 
        boolean onHeader = x >= header.getLeft() && x <= header.getRight()

                && y >= header.getTop() && y <= header.getBottom();

        if (mQsExpanded) {

            return onHeader || (mScrollView.isScrolledToBottom() && yDiff < 0);

            return onHeader || (mScrollView.isScrolledToBottom() && yDiff < 0) && isInQsArea(x, y);

        } else {

            return onHeader;

        }
@@ -1087,8 +1100,9 @@ public class NotificationPanelView extends PanelView implements 
        }

        if (!isInSettings()) {

            return mNotificationStackScroller.isScrolledToBottom();

        } else {

            return mScrollView.isScrolledToBottom();

        }

        return super.isScrolledToBottom();

    }



    @Override
@@ -1354,6 +1368,9 @@ public class NotificationPanelView extends PanelView implements 
                || mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED) {

            mAfforanceHelper.animateHideLeftRightIcon();

        }

        if (mQsExpanded) {

            mTwoFingerQsExpand = true;

        }

    }



    @Override

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

+8 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ public class ObservableScrollView extends ScrollView { 
    private int mLastOverscrollAmount;

    private boolean mTouchEnabled = true;

    private boolean mHandlingTouchEvent;

    private float mLastX;

    private float mLastY;



    public ObservableScrollView(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -65,6 +67,8 @@ public class ObservableScrollView extends ScrollView { 
    @Override

    public boolean onTouchEvent(MotionEvent ev) {

        mHandlingTouchEvent = true;

        mLastX = ev.getX();

        mLastY = ev.getY();

        boolean result = super.onTouchEvent(ev);

        mHandlingTouchEvent = false;

        return result;
@@ -73,6 +77,8 @@ public class ObservableScrollView extends ScrollView { 
    @Override

    public boolean onInterceptTouchEvent(MotionEvent ev) {

        mHandlingTouchEvent = true;

        mLastX = ev.getX();

        mLastY = ev.getY();

        boolean result = super.onInterceptTouchEvent(ev);

        mHandlingTouchEvent = false;

        return result;
@@ -107,12 +113,12 @@ public class ObservableScrollView extends ScrollView { 
    protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) {

        super.onOverScrolled(scrollX, scrollY, clampedX, clampedY);

        if (mListener != null && mLastOverscrollAmount > 0) {

            mListener.onOverscrolled(mLastOverscrollAmount);

            mListener.onOverscrolled(mLastX, mLastY, mLastOverscrollAmount);

        }

    }



    public interface Listener {

        void onScrollChanged();

        void onOverscrolled(int amount);

        void onOverscrolled(float lastX, float lastY, int amount);

    }

}

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

+16 −0
Original line number Diff line number Diff line
@@ -2123,6 +2123,22 @@ public class NotificationStackScrollLayout extends ViewGroup 
        return mDismissView.getHeight() + mPaddingBetweenElementsNormal;

    }



    public float getBottomMostNotificationBottom() {

        final int count = getChildCount();

        float max = 0;

        for (int childIdx = 0; childIdx < count; childIdx++) {

            ExpandableView child = (ExpandableView) getChildAt(childIdx);

            if (child.getVisibility() == GONE) {

                continue;

            }

            float bottom = child.getTranslationY() + child.getActualHeight();

            if (bottom > max) {

                max = bottom;

            }

        }

        return max + getTranslationY();

    }



    /**

     * A listener that is notified when some child locations might have changed.

     */