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

Commit a4983edd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Pass last touch event to DragDownHelper when starting doze" into... 

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

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



Change-Id: If806106e0a7d9c7f2b3ef2892d035cff5f84bb89
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8178bf6 acd2df96

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;

                }

            }