resolve merge conflicts of 48c71cb to master (feb97254) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1262,7 +1262,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		if (!isScrollingEnabled()) {
		return false;
		}
		if (isInsideQsContainer(ev)) {
		if (isInsideQsContainer(ev) && !mIsBeingDragged) {
		return false;
		}
		mForcedScroll = null;