From e651a3a081d3f567f47a8ba647c07d91446f0a6e Mon Sep 17 00:00:00 2001
From: Shawn Lee <syeonlee@google.com>
Date: Tue, 16 May 2023 11:28:22 -0700
Subject: [PATCH] Pass last touch event to DragDownHelper when starting doze

This stops QS container being stuck in a bad state if it was
being opened over keyguard when dozing started.

Bug: 279707140
Test: manually verified QQS over keyguard to doze transition
Change-Id: Ic8b02151ff5e497993bc9d74fd0db9f9bfe2f8df
---
 .../shade/NotificationShadeWindowViewController.java      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
index cb3fa15655b2e..a9002c87a67f6 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
@@ -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;
                 }
             }