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

Commit 2cee9ecc authored by Dave Mankoff's avatar Dave Mankoff Committed by Steve Elliott
Browse files

Move Some Touch Handling out of NSSL 

Move some touch handling out of NotificationStackScrollLayout and into
NotificationStackScrollLayoutController.

This corresponds with removing NotificationGutsManager from the NSSL.

The code looks a little funny right now, with the Controller querying
the NSSL for _a lot_ of state that should probably live in the
Controller, but I wanted to keep the size of this change reasonable.

Bug: 147245740
Test: atest SystemUITests && manual
Change-Id: I8ba68ea72898369202b052bee0c46d5c7bd8f032
parent f217e90e

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

+71 −135
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ import com.android.systemui.Dumpable; 
import com.android.systemui.ExpandHelper;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;

import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.DragDownHelper.DragDownCallback;
@@ -125,9 +124,6 @@ import com.android.systemui.statusbar.notification.row.ExpandableView; 
import com.android.systemui.statusbar.notification.row.FooterView;

import com.android.systemui.statusbar.notification.row.ForegroundServiceDungeonView;

import com.android.systemui.statusbar.notification.row.NotificationBlockingHelperManager;

import com.android.systemui.statusbar.notification.row.NotificationGuts;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.row.NotificationSnooze;

import com.android.systemui.statusbar.notification.row.StackScrollerDecorView;

import com.android.systemui.statusbar.phone.HeadsUpAppearanceController;

import com.android.systemui.statusbar.phone.HeadsUpTouchHelper;
@@ -136,7 +132,6 @@ import com.android.systemui.statusbar.phone.LockscreenGestureLogger.LockscreenUi 
import com.android.systemui.statusbar.phone.NotificationGroupManager;

import com.android.systemui.statusbar.phone.NotificationGroupManager.OnGroupChangeListener;

import com.android.systemui.statusbar.phone.NotificationPanelViewController;

import com.android.systemui.statusbar.phone.ScrimController;

import com.android.systemui.statusbar.phone.ShadeController;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.statusbar.policy.HeadsUpUtil;
@@ -493,7 +488,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    private Interpolator mHideXInterpolator = Interpolators.FAST_OUT_SLOW_IN;

    private NotificationPanelViewController mNotificationPanelController;



    private final NotificationGutsManager mNotificationGutsManager;

    private final NotificationSectionsManager mSectionsManager;

    private final ForegroundServiceSectionController mFgsSectionController;

    private ForegroundServiceDungeonView mFgsSectionView;
@@ -509,6 +503,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    private boolean mKeyguardMediaControllorVisible;

    private NotificationEntry mTopHeadsUpEntry;

    private long mNumHeadsUp;

    private NotificationStackScrollLayoutController.TouchHandler mTouchHandler;



    private final ExpandableView.OnHeightChangedListener mOnChildHeightChangedListener =

            new ExpandableView.OnHeightChangedListener() {
@@ -558,7 +553,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
            NotificationRoundnessManager notificationRoundnessManager,

            DynamicPrivacyController dynamicPrivacyController,

            SysuiStatusBarStateController statusbarStateController,

            NotificationGutsManager notificationGutsManager,

            NotificationSectionsManager notificationSectionsManager,

            ForegroundServiceSectionController fgsSectionController,

            ForegroundServiceDismissalFeatureController fgsFeatureController,
@@ -572,8 +566,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        Resources res = getResources();



        mRoundnessManager = notificationRoundnessManager;



        mNotificationGutsManager = notificationGutsManager;

        mFgsSectionController = fgsSectionController;



        mSectionsManager = notificationSectionsManager;
@@ -3723,58 +3715,16 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    @Override

    @ShadeViewRefactor(RefactorComponent.INPUT)

    public boolean onTouchEvent(MotionEvent ev) {

        NotificationGuts guts = mNotificationGutsManager.getExposedGuts();

        boolean isCancelOrUp = ev.getActionMasked() == MotionEvent.ACTION_CANCEL

                || ev.getActionMasked() == MotionEvent.ACTION_UP;

        handleEmptySpaceClick(ev);

        boolean expandWantsIt = false;

        boolean swipingInProgress = mSwipingInProgress;

        if (mIsExpanded && !swipingInProgress && !mOnlyScrollingInThisMotion && guts == null) {

            if (isCancelOrUp) {

                mExpandHelper.onlyObserveMovements(false);

            }

            boolean wasExpandingBefore = mExpandingNotification;

            expandWantsIt = mExpandHelper.onTouchEvent(ev);

            if (mExpandedInThisMotion && !mExpandingNotification && wasExpandingBefore

                    && !mDisallowScrollingInThisMotion) {

                dispatchDownEventToScroller(ev);

            }

        }

        boolean scrollerWantsIt = false;

        if (mIsExpanded && !swipingInProgress && !mExpandingNotification

                && !mDisallowScrollingInThisMotion) {

            scrollerWantsIt = onScrollTouch(ev);

        }

        boolean horizontalSwipeWantsIt = false;

        if (!mIsBeingDragged

                && !mExpandingNotification

                && !mExpandedInThisMotion

                && !mOnlyScrollingInThisMotion

                && !mDisallowDismissInThisMotion) {

            horizontalSwipeWantsIt = mSwipeHelper.onTouchEvent(ev);

        if (mTouchHandler != null && mTouchHandler.onTouchEvent(ev)) {

            return true;

        }



        // Check if we need to clear any snooze leavebehinds

        if (guts != null && !NotificationSwipeHelper.isTouchInView(ev, guts)

                && guts.getGutsContent() instanceof NotificationSnooze) {

            NotificationSnooze ns = (NotificationSnooze) guts.getGutsContent();

            if ((ns.isExpanded() && isCancelOrUp)

                    || (!horizontalSwipeWantsIt && scrollerWantsIt)) {

                // If the leavebehind is expanded we clear it on the next up event, otherwise we

                // clear it on the next non-horizontal swipe or expand event.

                checkSnoozeLeavebehind();

            }

        }

        if (ev.getActionMasked() == MotionEvent.ACTION_UP) {

            mCheckForLeavebehind = true;

        }

        return horizontalSwipeWantsIt || scrollerWantsIt || expandWantsIt || super.onTouchEvent(ev);

        return super.onTouchEvent(ev);

    }



    @ShadeViewRefactor(RefactorComponent.INPUT)

    private void dispatchDownEventToScroller(MotionEvent ev) {

    void dispatchDownEventToScroller(MotionEvent ev) {

        MotionEvent downEvent = MotionEvent.obtain(ev);

        downEvent.setAction(MotionEvent.ACTION_DOWN);

        onScrollTouch(downEvent);
@@ -3823,7 +3773,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    @ShadeViewRefactor(RefactorComponent.INPUT)

    private boolean onScrollTouch(MotionEvent ev) {

    boolean onScrollTouch(MotionEvent ev) {

        if (!isScrollingEnabled()) {

            return false;

        }
@@ -3912,7 +3862,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
                        customOverScrollBy((int) scrollAmount, mOwnScrollY,

                                range, getHeight() / 2);

                        // If we're scrolling, leavebehinds should be dismissed

                        checkSnoozeLeavebehind();

                        mController.checkSnoozeLeavebehind();

                    }

                }

                break;
@@ -4030,44 +3980,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    @Override

    @ShadeViewRefactor(RefactorComponent.INPUT)

    public boolean onInterceptTouchEvent(MotionEvent ev) {

        initDownStates(ev);

        handleEmptySpaceClick(ev);



        NotificationGuts guts = mNotificationGutsManager.getExposedGuts();

        boolean expandWantsIt = false;

        boolean swipingInProgress = mSwipingInProgress;

        if (!swipingInProgress && !mOnlyScrollingInThisMotion && guts == null) {

            expandWantsIt = mExpandHelper.onInterceptTouchEvent(ev);

        }

        boolean scrollWantsIt = false;

        if (!swipingInProgress && !mExpandingNotification) {

            scrollWantsIt = onInterceptTouchEventScroll(ev);

        }

        boolean swipeWantsIt = false;

        if (!mIsBeingDragged

                && !mExpandingNotification

                && !mExpandedInThisMotion

                && !mOnlyScrollingInThisMotion

                && !mDisallowDismissInThisMotion) {

            swipeWantsIt = mSwipeHelper.onInterceptTouchEvent(ev);

        }

        // Check if we need to clear any snooze leavebehinds

        boolean isUp = ev.getActionMasked() == MotionEvent.ACTION_UP;

        if (!NotificationSwipeHelper.isTouchInView(ev, guts) && isUp && !swipeWantsIt &&

                !expandWantsIt && !scrollWantsIt) {

            mCheckForLeavebehind = false;

            mNotificationGutsManager.closeAndSaveGuts(true /* removeLeavebehind */,

                    false /* force */, false /* removeControls */, -1 /* x */, -1 /* y */,

                    false /* resetMenu */);

        }

        if (ev.getActionMasked() == MotionEvent.ACTION_UP) {

            mCheckForLeavebehind = true;

        if (mTouchHandler != null && mTouchHandler.onInterceptTouchEvent(ev)) {

            return true;

        }

        return swipeWantsIt || scrollWantsIt || expandWantsIt || super.onInterceptTouchEvent(ev);

        return super.onInterceptTouchEvent(ev);

    }



    @ShadeViewRefactor(RefactorComponent.INPUT)

    private void handleEmptySpaceClick(MotionEvent ev) {

    void handleEmptySpaceClick(MotionEvent ev) {

        switch (ev.getActionMasked()) {

            case MotionEvent.ACTION_MOVE:

                final float touchSlop = getTouchSlop(ev);
@@ -4086,7 +4006,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    @ShadeViewRefactor(RefactorComponent.INPUT)

    private void initDownStates(MotionEvent ev) {

    void initDownStates(MotionEvent ev) {

        if (ev.getAction() == MotionEvent.ACTION_DOWN) {

            mExpandedInThisMotion = false;

            mOnlyScrollingInThisMotion = !mScroller.isFinished();
@@ -4108,7 +4028,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    @ShadeViewRefactor(RefactorComponent.INPUT)

    private boolean onInterceptTouchEventScroll(MotionEvent ev) {

    boolean onInterceptTouchEventScroll(MotionEvent ev) {

        if (!isScrollingEnabled()) {

            return false;

        }
@@ -4303,29 +4223,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        return false;

    }



    @ShadeViewRefactor(RefactorComponent.INPUT)

    public void closeControlsIfOutsideTouch(MotionEvent ev) {

        NotificationGuts guts = mNotificationGutsManager.getExposedGuts();

        NotificationMenuRowPlugin menuRow = mSwipeHelper.getCurrentMenuRow();

        View translatingParentView = mSwipeHelper.getTranslatingParentView();

        View view = null;

        if (guts != null && !guts.getGutsContent().isLeavebehind()) {

            // Only close visible guts if they're not a leavebehind.

            view = guts;

        } else if (menuRow != null && menuRow.isMenuVisible()

                && translatingParentView != null) {

            // Checking menu

            view = translatingParentView;

        }

        if (view != null && !NotificationSwipeHelper.isTouchInView(ev, view)) {

            // Touch was outside visible guts / menu notification, close what's visible

            mNotificationGutsManager.closeAndSaveGuts(false /* removeLeavebehind */,

                    false /* force */, true /* removeControls */, -1 /* x */, -1 /* y */,

                    false /* resetMenu */);

            resetExposedMenuView(true /* animate */, true /* force */);

        }

    }



    @ShadeViewRefactor(RefactorComponent.INPUT)

    void setSwipingInProgress(boolean swiping) {

        mSwipingInProgress = swiping;
@@ -4361,32 +4258,15 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        return Math.max(mMaxLayoutHeight - mContentHeight, 0);

    }



    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    void checkSnoozeLeavebehind() {

        if (mCheckForLeavebehind) {

            mNotificationGutsManager.closeAndSaveGuts(true /* removeLeavebehind */,

                    false /* force */, false /* removeControls */, -1 /* x */, -1 /* y */,

                    false /* resetMenu */);

            mCheckForLeavebehind = false;

        }

    }



    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    void resetCheckSnoozeLeavebehind() {

        mCheckForLeavebehind = true;

    }



    @ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)

    void onExpansionStarted() {

        mIsExpansionChanging = true;

        mAmbientState.setExpansionChanging(true);

        checkSnoozeLeavebehind();

    }



    @ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)

    void onExpansionStopped() {

        mIsExpansionChanging = false;

        resetCheckSnoozeLeavebehind();

        mAmbientState.setExpansionChanging(false);

        if (!mIsExpanded) {

            resetScrollPosition();
@@ -5795,6 +5675,58 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        mAmbientState.setHasAlertEntries(numHeadsUp > 0);

    }



    boolean getSwipingInProgress() {

        return mSwipingInProgress;

    }



    public boolean getIsExpanded() {

        return mIsExpanded;

    }



    boolean getOnlyScrollingInThisMotion() {

        return mOnlyScrollingInThisMotion;

    }



    ExpandHelper getExpandHelper() {

        return mExpandHelper;

    }



    boolean isExpandingNotification() {

        return mExpandingNotification;

    }



    boolean getDisallowScrollingInThisMotion() {

        return mDisallowScrollingInThisMotion;

    }



    boolean isBeingDragged() {

        return mIsBeingDragged;

    }



    boolean getExpandedInThisMotion() {

        return mExpandedInThisMotion;

    }



    boolean getDisallowDismissInThisMotion() {

        return mDisallowDismissInThisMotion;

    }



    void setCheckForLeaveBehind(boolean checkForLeaveBehind) {

        mCheckForLeavebehind = checkForLeaveBehind;

    }



    void setTouchHandler(NotificationStackScrollLayoutController.TouchHandler touchHandler) {

        mTouchHandler = touchHandler;

    }



    boolean isSwipingInProgress() {

        return mSwipingInProgress;

    }



    boolean getCheckSnoozeLeaveBehind() {

        return mCheckForLeavebehind;

    }



    /**

     * A listener that is notified when the empty space below the notifications is clicked on

     */
@@ -5890,7 +5822,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    void resetExposedMenuView(boolean animate, boolean force) {

    private void resetExposedMenuView(boolean animate, boolean force) {

        mSwipeHelper.resetExposedMenuView(animate, force);

    }
@@ -6248,6 +6180,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        mKeyguardMediaControllorVisible = keyguardMediaControllorVisible;

    }



    void resetCheckSnoozeLeavebehind() {

        setCheckForLeaveBehind(true);

    }



    // ---------------------- DragDownHelper.OnDragDownListener ------------------------------------



    @ShadeViewRefactor(RefactorComponent.INPUT)
@@ -6300,7 +6236,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        @Override

        public void onTouchSlopExceeded() {

            cancelLongPress();

            checkSnoozeLeavebehind();

            mController.checkSnoozeLeavebehind();

        }



        @Override

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

+137 −8
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import android.widget.FrameLayout; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.systemui.ExpandHelper;

import com.android.systemui.Gefingerpoken;

import com.android.systemui.R;

import com.android.systemui.SwipeHelper;

import com.android.systemui.colorextraction.SysuiColorExtractor;
@@ -58,7 +60,9 @@ import com.android.systemui.statusbar.notification.logging.NotificationLogger; 
import com.android.systemui.statusbar.notification.row.ActivatableNotificationView;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.ExpandableView;

import com.android.systemui.statusbar.notification.row.NotificationGuts;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.row.NotificationSnooze;

import com.android.systemui.statusbar.phone.HeadsUpAppearanceController;

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

import com.android.systemui.statusbar.phone.HeadsUpTouchHelper;
@@ -258,7 +262,7 @@ public class NotificationStackScrollLayoutController { 
                    }



                    // Close the menu row since we went directly to the guts

                    mView.resetExposedMenuView(false, true);

                    mSwipeHelper.resetExposedMenuView(false, true);

                }

            }

        }
@@ -523,6 +527,7 @@ public class NotificationStackScrollLayoutController { 
    public void attach(NotificationStackScrollLayout view) {

        mView = view;

        mView.setController(this);

        mView.setTouchHandler(new TouchHandler());



        mSwipeHelper = mNotificationSwipeHelperBuilder

                .setSwipeDirection(SwipeHelper.X)
@@ -780,7 +785,12 @@ public class NotificationStackScrollLayoutController { 
    }



    public void checkSnoozeLeavebehind() {

        mView.checkSnoozeLeavebehind();

        if (mView.getCheckSnoozeLeaveBehind()) {

            mNotificationGutsManager.closeAndSaveGuts(true /* removeLeavebehind */,

                    false /* force */, false /* removeControls */, -1 /* x */, -1 /* y */,

                    false /* resetMenu */);

            mView.setCheckForLeaveBehind(false);

        }

    }



    public void setQsExpanded(boolean expanded) {
@@ -803,10 +813,6 @@ public class NotificationStackScrollLayoutController { 
        mView.updateTopPadding(qsHeight, animate);

    }



    public void resetCheckSnoozeLeavebehind() {

        mView.resetCheckSnoozeLeavebehind();

    }



    public boolean isScrolledToBottom() {

        return mView.isScrolledToBottom();

    }
@@ -857,9 +863,11 @@ public class NotificationStackScrollLayoutController { 


    public void onExpansionStarted() {

        mView.onExpansionStarted();

        checkSnoozeLeavebehind();

    }



    public void onExpansionStopped() {

        mView.setCheckForLeaveBehind(false);

        mView.onExpansionStopped();

    }
@@ -1052,7 +1060,7 @@ public class NotificationStackScrollLayoutController { 
        return mView.calculateGapHeight(previousView, child, count);

    }



    public NotificationRoundnessManager getNoticationRoundessManager() {

    NotificationRoundnessManager getNoticationRoundessManager() {

        return mNotificationRoundnessManager;

    }
@@ -1060,6 +1068,32 @@ public class NotificationStackScrollLayoutController { 
        return mNotificationListContainer;

    }



    public void resetCheckSnoozeLeavebehind() {

        mView.resetCheckSnoozeLeavebehind();

    }



    public void closeControlsIfOutsideTouch(MotionEvent ev) {

        NotificationGuts guts = mNotificationGutsManager.getExposedGuts();

        NotificationMenuRowPlugin menuRow = mSwipeHelper.getCurrentMenuRow();

        View translatingParentView = mSwipeHelper.getTranslatingParentView();

        View view = null;

        if (guts != null && !guts.getGutsContent().isLeavebehind()) {

            // Only close visible guts if they're not a leavebehind.

            view = guts;

        } else if (menuRow != null && menuRow.isMenuVisible()

                && translatingParentView != null) {

            // Checking menu

            view = translatingParentView;

        }

        if (view != null && !NotificationSwipeHelper.isTouchInView(ev, view)) {

            // Touch was outside visible guts / menu notification, close what's visible

            mNotificationGutsManager.closeAndSaveGuts(false /* removeLeavebehind */,

                    false /* force */, true /* removeControls */, -1 /* x */, -1 /* y */,

                    false /* resetMenu */);

            mSwipeHelper.resetExposedMenuView(true /* animate */, true /* force */);

        }

    }



    private class NotificationListContainerImpl implements NotificationListContainer {

        @Override

        public void setChildTransferInProgress(boolean childTransferInProgress) {
@@ -1134,7 +1168,7 @@ public class NotificationStackScrollLayoutController { 


        @Override

        public void resetExposedMenuView(boolean animate, boolean force) {

            mView.resetExposedMenuView(animate, force);

            mSwipeHelper.resetExposedMenuView(animate, force);

        }



        @Override
@@ -1198,4 +1232,99 @@ public class NotificationStackScrollLayoutController { 
            mView.setWillExpand(willExpand);

        }

    }



    class TouchHandler implements Gefingerpoken {

        @Override

        public boolean onInterceptTouchEvent(MotionEvent ev) {

            mView.initDownStates(ev);

            mView.handleEmptySpaceClick(ev);



            NotificationGuts guts = mNotificationGutsManager.getExposedGuts();

            boolean expandWantsIt = false;

            boolean swipingInProgress = mView.isSwipingInProgress();

            if (!swipingInProgress && !mView.getOnlyScrollingInThisMotion() && guts == null) {

                expandWantsIt = mView.getExpandHelper().onInterceptTouchEvent(ev);

            }

            boolean scrollWantsIt = false;

            if (!swipingInProgress && !mView.isExpandingNotification()) {

                scrollWantsIt = mView.onInterceptTouchEventScroll(ev);

            }

            boolean swipeWantsIt = false;

            if (!mView.isBeingDragged()

                    && !mView.isExpandingNotification()

                    && !mView.getExpandedInThisMotion()

                    && !mView.getOnlyScrollingInThisMotion()

                    && !mView.getDisallowDismissInThisMotion()) {

                swipeWantsIt = mSwipeHelper.onInterceptTouchEvent(ev);

            }

            // Check if we need to clear any snooze leavebehinds

            boolean isUp = ev.getActionMasked() == MotionEvent.ACTION_UP;

            if (!NotificationSwipeHelper.isTouchInView(ev, guts) && isUp && !swipeWantsIt &&

                    !expandWantsIt && !scrollWantsIt) {

                mView.setCheckForLeaveBehind(false);

                mNotificationGutsManager.closeAndSaveGuts(true /* removeLeavebehind */,

                        false /* force */, false /* removeControls */, -1 /* x */, -1 /* y */,

                        false /* resetMenu */);

            }

            if (ev.getActionMasked() == MotionEvent.ACTION_UP) {

                mView.setCheckForLeaveBehind(true);

            }

            return swipeWantsIt || scrollWantsIt || expandWantsIt;

        }



        @Override

        public boolean onTouchEvent(MotionEvent ev) {

            NotificationGuts guts = mNotificationGutsManager.getExposedGuts();

            boolean isCancelOrUp = ev.getActionMasked() == MotionEvent.ACTION_CANCEL

                    || ev.getActionMasked() == MotionEvent.ACTION_UP;

            mView.handleEmptySpaceClick(ev);

            boolean expandWantsIt = false;

            boolean swipingInProgress = mView.getSwipingInProgress();

            boolean onlyScrollingInThisMotion = mView.getOnlyScrollingInThisMotion();

            boolean expandingNotification = mView.isExpandingNotification();

            if (mView.getIsExpanded() && !swipingInProgress && !onlyScrollingInThisMotion

                    && guts == null) {

                ExpandHelper expandHelper = mView.getExpandHelper();

                if (isCancelOrUp) {

                    expandHelper.onlyObserveMovements(false);

                }

                boolean wasExpandingBefore = expandingNotification;

                expandWantsIt = expandHelper.onTouchEvent(ev);

                expandingNotification = mView.isExpandingNotification();

                if (mView.getExpandedInThisMotion() && !expandingNotification && wasExpandingBefore

                        && !mView.getDisallowScrollingInThisMotion()) {

                    mView.dispatchDownEventToScroller(ev);

                }

            }

            boolean scrollerWantsIt = false;

            if (mView.isExpanded() && !swipingInProgress && !expandingNotification

                    && !mView.getDisallowScrollingInThisMotion()) {

                scrollerWantsIt = mView.onScrollTouch(ev);

            }

            boolean horizontalSwipeWantsIt = false;

            if (!mView.isBeingDragged()

                    && !expandingNotification

                    && !mView.getExpandedInThisMotion()

                    && !onlyScrollingInThisMotion

                    && !mView.getDisallowDismissInThisMotion()) {

                horizontalSwipeWantsIt = mSwipeHelper.onTouchEvent(ev);

            }



            // Check if we need to clear any snooze leavebehinds

            if (guts != null && !NotificationSwipeHelper.isTouchInView(ev, guts)

                    && guts.getGutsContent() instanceof NotificationSnooze) {

                NotificationSnooze ns = (NotificationSnooze) guts.getGutsContent();

                if ((ns.isExpanded() && isCancelOrUp)

                        || (!horizontalSwipeWantsIt && scrollerWantsIt)) {

                    // If the leavebehind is expanded we clear it on the next up event, otherwise we

                    // clear it on the next non-horizontal swipe or expand event.

                    checkSnoozeLeavebehind();

                }

            }

            if (ev.getActionMasked() == MotionEvent.ACTION_UP) {

                mView.setCheckForLeaveBehind(true);

            }

            return horizontalSwipeWantsIt || scrollerWantsIt || expandWantsIt;

        }

    }

}

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

+6 −2

File changed.

Preview size limit exceeded, changes collapsed.

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

+14 −1
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    private ScrimView mScrimBehind;

    private ScrimView mScrimForBubble;



    private Runnable mScrimBehindChangeRunnable;



    private final KeyguardStateController mKeyguardStateController;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final DozeParameters mDozeParameters;
@@ -241,6 +243,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
        mScrimInFront = scrimInFront;

        mScrimForBubble = scrimForBubble;



        if (mScrimBehindChangeRunnable != null) {

            mScrimBehind.setChangeRunnable(mScrimBehindChangeRunnable);

            mScrimBehindChangeRunnable = null;

        }



        final ScrimState[] states = ScrimState.values();

        for (int i = 0; i < states.length; i++) {

            states[i].init(mScrimInFront, mScrimBehind, mScrimForBubble, mDozeParameters,
@@ -934,8 +941,14 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, OnCo 
    }



    public void setScrimBehindChangeRunnable(Runnable changeRunnable) {

        // TODO: remove this. This is necessary because of an order-of-operations limitation.

        // The fix is to move more of these class into @StatusBarScope

        if (mScrimBehind == null) {

            mScrimBehindChangeRunnable = changeRunnable;

        } else {

            mScrimBehind.setChangeRunnable(changeRunnable);

        }

    }



    public void setCurrentUser(int currentUser) {

        // Don't care in the base class.

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

+0 −3

File changed.

Preview size limit exceeded, changes collapsed.