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

Commit 82c2e128 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 udc-dev am: 4422c68b 

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



Change-Id: If2ee3b589112426ac321cbfce13a337b5827cad2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 211b20e0 4422c68b

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;

                }

            }