diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt index 02c98ae2867d..88f148b00cdc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt @@ -121,14 +121,14 @@ constructor( } override fun onInterceptTouchEvent(event: MotionEvent): Boolean { - return canHandleMotionEvent() && startExpansion(event) + return maybeStartExpansion(event) } - private fun canHandleMotionEvent(): Boolean { - return !wakeUpCoordinator.canShowPulsingHuns || qsExpanded || bouncerShowing - } - - private fun startExpansion(event: MotionEvent): Boolean { + private fun maybeStartExpansion(event: MotionEvent): Boolean { + if (!wakeUpCoordinator.canShowPulsingHuns || qsExpanded || + bouncerShowing) { + return false + } if (velocityTracker == null) { velocityTracker = VelocityTracker.obtain() } @@ -177,14 +177,9 @@ constructor( } override fun onTouchEvent(event: MotionEvent): Boolean { - if (!canHandleMotionEvent()) { - return false - } - - if (!isExpanding || event.actionMasked == MotionEvent.ACTION_DOWN) { - return startExpansion(event) + if (!isExpanding) { + return maybeStartExpansion(event) } - velocityTracker!!.addMovement(event) val y = event.y |