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

Commit 54eef522 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Prevent dismissal on RemoteInputView" into nyc-dev 

am: 39d60bac

* commit '39d60bac':
  Prevent dismissal on RemoteInputView

Change-Id: I4a4b62545a0b95afc1f4f01d9e7579240453b58d
parents a5dc52f4 39d60bac

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene 
            findScrollContainer();

            if (mScrollContainer != null) {

                mScrollContainer.requestDisallowLongPress();

                mScrollContainer.requestDisallowDismiss();

            }

        }

        return super.onInterceptTouchEvent(ev);

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

+11 −2
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
     * animating.

     */

    private boolean mOnlyScrollingInThisMotion;

    private boolean mDisallowDismissInThisMotion;

    private boolean mInterceptDelegateEnabled;

    private boolean mDelegateToScrollView;

    private boolean mDisallowScrollingInThisMotion;
@@ -1031,7 +1032,8 @@ public class NotificationStackScrollLayout extends ViewGroup 
        if (!mIsBeingDragged

                && !mExpandingNotification

                && !mExpandedInThisMotion

                && !mOnlyScrollingInThisMotion) {

                && !mOnlyScrollingInThisMotion

                && !mDisallowDismissInThisMotion) {

            horizontalSwipeWantsIt = mSwipeHelper.onTouchEvent(ev);

        }

        return horizontalSwipeWantsIt || scrollerWantsIt || expandWantsIt || super.onTouchEvent(ev);
@@ -2013,7 +2015,8 @@ public class NotificationStackScrollLayout extends ViewGroup 
        if (!mIsBeingDragged

                && !mExpandingNotification

                && !mExpandedInThisMotion

                && !mOnlyScrollingInThisMotion) {

                && !mOnlyScrollingInThisMotion

                && !mDisallowDismissInThisMotion) {

            swipeWantsIt = mSwipeHelper.onInterceptTouchEvent(ev);

        }

        return swipeWantsIt || scrollWantsIt || expandWantsIt || super.onInterceptTouchEvent(ev);
@@ -2041,6 +2044,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
            mExpandedInThisMotion = false;

            mOnlyScrollingInThisMotion = !mScroller.isFinished();

            mDisallowScrollingInThisMotion = false;

            mDisallowDismissInThisMotion = false;

            mTouchIsClick = true;

            mInitialTouchX = ev.getX();

            mInitialTouchY = ev.getY();
@@ -2705,6 +2709,11 @@ public class NotificationStackScrollLayout extends ViewGroup 
        removeLongPressCallback();

    }



    @Override

    public void requestDisallowDismiss() {

        mDisallowDismissInThisMotion = true;

    }



    public void removeLongPressCallback() {

        mSwipeHelper.removeLongPressCallback();

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -33,4 +33,9 @@ public interface ScrollContainer { 
     * Request that the view is made visible by scrolling to it.

     */

    void scrollTo(View v);



    /**

     * Request that the view does not dismiss for the current touch.

     */

    void requestDisallowDismiss();

}