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

Commit 914f6721 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make touchXOutsideOfQs require split shade to be enabled" into tm-qpr-dev am: 6e8b02c2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20691916



Change-Id: I258acbf5de23de792a1f1df54eb1ce6b7bcf67b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c97fee00 6e8b02c2

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+7 −5
Original line number Diff line number Diff line
@@ -2325,7 +2325,7 @@ public final class NotificationPanelViewController implements Dumpable { 




    private boolean handleQsTouch(MotionEvent event) {

        if (mSplitShadeEnabled && touchXOutsideOfQs(event.getX())) {

        if (isSplitShadeAndTouchXOutsideQs(event.getX())) {

            return false;

        }

        final int action = event.getActionMasked();
@@ -2382,12 +2382,14 @@ public final class NotificationPanelViewController implements Dumpable { 
        return false;

    }



    private boolean touchXOutsideOfQs(float touchX) {

        return touchX < mQsFrame.getX() || touchX > mQsFrame.getX() + mQsFrame.getWidth();

    /** Returns whether split shade is enabled and an x coordinate is outside of the QS frame. */

    private boolean isSplitShadeAndTouchXOutsideQs(float touchX) {

        return mSplitShadeEnabled && (touchX < mQsFrame.getX()

                || touchX > mQsFrame.getX() + mQsFrame.getWidth());

    }



    private boolean isInQsArea(float x, float y) {

        if (touchXOutsideOfQs(x)) {

        if (isSplitShadeAndTouchXOutsideQs(x)) {

            return false;

        }

        // Let's reject anything at the very bottom around the home handle in gesture nav
@@ -5316,7 +5318,7 @@ public final class NotificationPanelViewController implements Dumpable { 
        @Override

        public void flingTopOverscroll(float velocity, boolean open) {

            // in split shade mode we want to expand/collapse QS only when touch happens within QS

            if (mSplitShadeEnabled && touchXOutsideOfQs(mInitialTouchX)) {

            if (isSplitShadeAndTouchXOutsideQs(mInitialTouchX)) {

                return;

            }

            mLastOverscroll = 0f;