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

Commit 2663a194 authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Automerger Merge Worker
Browse files

Merge "Fix notification group scroll in split shade" into tm-dev am: f2b58a1a 

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



Change-Id: I62dd3c18d8e5b4e63c32e0461f30a9f7b9a0abe3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3bcf3e4 f2b58a1a

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

+9 −6
Original line number Diff line number Diff line
@@ -347,7 +347,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
            setDimAmount((Float) animation.getAnimatedValue());

        }

    };

    protected ViewGroup mQsContainer;

    protected ViewGroup mQsHeader;

    // Rect of QsHeader. Kept as a field just to avoid creating a new one each time.

    private Rect mQsHeaderBound = new Rect();

    private boolean mContinuousShadowUpdate;

    private boolean mContinuousBackgroundUpdate;

    private ViewTreeObserver.OnPreDrawListener mShadowUpdater
@@ -1598,8 +1600,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    @ShadeViewRefactor(RefactorComponent.ADAPTER)

    public void setQsContainer(ViewGroup qsContainer) {

        mQsContainer = qsContainer;

    public void setQsHeader(ViewGroup qsHeader) {

        mQsHeader = qsHeader;

    }



    @ShadeViewRefactor(RefactorComponent.ADAPTER)
@@ -3458,7 +3460,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        if (!isScrollingEnabled()) {

            return false;

        }

        if (isInsideQsContainer(ev) && !mIsBeingDragged) {

        if (isInsideQsHeader(ev) && !mIsBeingDragged) {

            return false;

        }

        mForcedScroll = null;
@@ -3611,8 +3613,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    @ShadeViewRefactor(RefactorComponent.INPUT)

    protected boolean isInsideQsContainer(MotionEvent ev) {

        return ev.getY() < mQsContainer.getBottom();

    protected boolean isInsideQsHeader(MotionEvent ev) {

        mQsHeader.getBoundsOnScreen(mQsHeaderBound);

        return mQsHeaderBound.contains((int) ev.getX(), (int) ev.getY());

    }



    @ShadeViewRefactor(RefactorComponent.INPUT)

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+3 −2
Original line number Diff line number Diff line
@@ -1234,8 +1234,9 @@ public class NotificationStackScrollLayoutController { 
        mView.setExpandedHeight(expandedHeight);

    }



    public void setQsContainer(ViewGroup view) {

        mView.setQsContainer(view);

    /** Sets the QS header. Used to check if a touch is within its bounds. */

    public void setQsHeader(ViewGroup view) {

        mView.setQsHeader(view);

    }



    public void setAnimationsEnabled(boolean enabled) {

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

+1 −1
Original line number Diff line number Diff line
@@ -3592,7 +3592,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                }

            });

            mLockscreenShadeTransitionController.setQS(mQs);

            mNotificationStackScrollLayoutController.setQsContainer((ViewGroup) mQs.getView());

            mNotificationStackScrollLayoutController.setQsHeader((ViewGroup) mQs.getHeader());

            mQs.setScrollListener(mScrollListener);

            updateQsExpansion();

        }