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

import android.view.MotionEvent

import android.view.VelocityTracker

import android.view.ViewConfiguration

import com.android.systemui.Gefingerpoken

import com.android.systemui.Interpolators

import com.android.systemui.R

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

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

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

import javax.inject.Inject

import javax.inject.Singleton

import kotlin.math.max

            MotionEvent.ACTION_UP -> {

                recycleVelocityTracker()

                isExpanding = false

            }

            MotionEvent.ACTION_CANCEL -> {

                recycleVelocityTracker()

                isExpanding = false

            }

        }

        return false

            return false

        }

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

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

                event.actionMasked == MotionEvent.ACTION_DOWN) {

            return startExpansion(event)

        }

        velocityTracker!!.addMovement(event)