Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I62248f2e176cc42a54b677e9053ba043c11c38be
This commit is contained in:
TreeHugger Robot
2020-06-18 15:10:19 +00:00
committed by Automerger Merge Worker
parent 4f949fa500 05df6a589e
commit c53ba4e800
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
View File

@@ -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)