Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass last touch event to DragDownHelper when starting doze" into udc-dev am: 4422c68b14

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23267936

Change-Id: I655eb1d0878a8bb65eb8cb8cc3fab616c9e8e78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-17 00:21:20 +00:00
committed by Automerger Merge Worker
parent 42fe02629e 4422c68b14
commit c142d4d167
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java
View File

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