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

Merge "Use event time instead of System.currentTimeMillis" into tm-qpr-dev am: 6de8305ba3

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

Change-Id: I411a6c07f64298f3b5f3afedb230ad4f6d2152f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ale Nijamkin
2023-01-18 01:00:24 +00:00
committed by Automerger Merge Worker
parent 080866a591 6de8305ba3
commit 432bcab140
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt
View File

@@ -342,14 +342,12 @@ object KeyguardBottomAreaViewBinder {
private val longPressDurationMs = ViewConfiguration.getLongPressTimeout().toLong() private val longPressDurationMs = ViewConfiguration.getLongPressTimeout().toLong()
private var longPressAnimator: ViewPropertyAnimator? = null private var longPressAnimator: ViewPropertyAnimator? = null
private var downTimestamp = 0L
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
override fun onTouch(v: View?, event: MotionEvent?): Boolean { override fun onTouch(v: View?, event: MotionEvent?): Boolean {
return when (event?.actionMasked) { return when (event?.actionMasked) {
MotionEvent.ACTION_DOWN -> MotionEvent.ACTION_DOWN ->
if (viewModel.configKey != null) { if (viewModel.configKey != null) {
downTimestamp = System.currentTimeMillis()
longPressAnimator = longPressAnimator =
view view
.animate() .animate()
@@ -396,7 +394,7 @@ object KeyguardBottomAreaViewBinder {
MotionEvent.ACTION_UP -> { MotionEvent.ACTION_UP -> {
cancel( cancel(
onAnimationEnd = onAnimationEnd =
if (System.currentTimeMillis() - downTimestamp < longPressDurationMs) { if (event.eventTime - event.downTime < longPressDurationMs) {
Runnable { Runnable {
messageDisplayer.invoke( messageDisplayer.invoke(
R.string.keyguard_affordance_press_too_short R.string.keyguard_affordance_press_too_short
@@ -437,7 +435,6 @@ object KeyguardBottomAreaViewBinder {
} }
private fun cancel(onAnimationEnd: Runnable? = null) { private fun cancel(onAnimationEnd: Runnable? = null) {
downTimestamp = 0L
longPressAnimator?.cancel() longPressAnimator?.cancel()
longPressAnimator = null longPressAnimator = null
view.animate().scaleX(1f).scaleY(1f).withEndAction(onAnimationEnd) view.animate().scaleX(1f).scaleY(1f).withEndAction(onAnimationEnd)