Merge "Pass last touch event to DragDownHelper when starting doze" into udc-dev (4422c68b) · Commits · e / os / android_frameworks_base

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -397,19 +397,15 @@ public class NotificationShadeWindowViewController {
		return true;
		}

		if (handled) {
		return true;
		}

		if (mMultiShadeMotionEventInteractor != null) {
		// This interactor is not null only if the dual shade feature is enabled.
		return mMultiShadeMotionEventInteractor.onTouchEvent(ev, mView.getWidth());
		} else if (mDragDownHelper.isDragDownEnabled()
		\|\| mDragDownHelper.isDraggingDown()) {
		// we still want to finish our drag down gesture when locking the screen
		return mDragDownHelper.onTouchEvent(ev);
		return mDragDownHelper.onTouchEvent(ev) \|\| handled;
		} else {
		return false;
		return handled;
		}
		}