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

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

Merge "Ensure that velocity tracker is never null." into rvc-dev am: 05df6a58 

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

Change-Id: Ia04f7b9578d2266dceff9ecbf7fea2067355723f
parents a7261125 05df6a58

packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt

+4 −3
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ import android.os.SystemClock 
import android.view.MotionEvent

import android.view.MotionEvent

import android.view.VelocityTracker

import android.view.VelocityTracker

import android.view.ViewConfiguration

import android.view.ViewConfiguration



import com.android.systemui.Gefingerpoken

import com.android.systemui.Gefingerpoken

import com.android.systemui.Interpolators

import com.android.systemui.Interpolators

import com.android.systemui.R

import com.android.systemui.R
@@ -41,7 +40,6 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll 
import com.android.systemui.statusbar.phone.HeadsUpManagerPhone

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.phone.ShadeController

import com.android.systemui.statusbar.phone.ShadeController



import javax.inject.Inject

import javax.inject.Inject

import javax.inject.Singleton

import javax.inject.Singleton

import kotlin.math.max

import kotlin.math.max
@@ -162,10 +160,12 @@ constructor( 




            MotionEvent.ACTION_UP -> {

            MotionEvent.ACTION_UP -> {

                recycleVelocityTracker()

                recycleVelocityTracker()

                isExpanding = false

            }

            }





            MotionEvent.ACTION_CANCEL -> {

            MotionEvent.ACTION_CANCEL -> {

                recycleVelocityTracker()

                recycleVelocityTracker()

                isExpanding = false

            }

            }

        }

        }

        return false

        return false
@@ -181,7 +181,8 @@ constructor( 
            return false

            return false

        }

        }





        if (!isExpanding || event.actionMasked == MotionEvent.ACTION_DOWN) {

        if (velocityTracker == null || !isExpanding ||

                event.actionMasked == MotionEvent.ACTION_DOWN) {

            return startExpansion(event)

            return startExpansion(event)

        }

        }

        velocityTracker!!.addMovement(event)

        velocityTracker!!.addMovement(event)