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

Merge "Only take vertical, upward velocity into account for escaping the dismiss target." into rvc-dev am: 254dcfd5f4

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

Change-Id: Id42aaf68ddd9847e765692f797ae512a0dff3644
This commit is contained in:
TreeHugger Robot
2020-06-18 17:43:54 +00:00
committed by Automerger Merge Worker
parent 0baaa00ffb 254dcfd5f4
commit 8066346b10
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/util/magnetictarget/MagnetizedObject.kt
View File

@@ -241,7 +241,7 @@ abstract class MagnetizedObject<T : Any>(
* to the target. If this velocity is reached, the object will be freed even if it wasn't moved * to the target. If this velocity is reached, the object will be freed even if it wasn't moved
* outside the magnetic field radius. * outside the magnetic field radius.
*/ */
var flingUnstuckFromTargetMinVelocity = 1000f var flingUnstuckFromTargetMinVelocity = 4000f
/** /**
* Sets the maximum X velocity above which the object will not stick to the target. Even if the * Sets the maximum X velocity above which the object will not stick to the target. Even if the
@@ -414,9 +414,10 @@ abstract class MagnetizedObject<T : Any>(
cancelAnimations() cancelAnimations()
if (objectStuckToTarget) { if (objectStuckToTarget) {
if (hypot(velX, velY) > flingUnstuckFromTargetMinVelocity) { if (-velY > flingUnstuckFromTargetMinVelocity) {
// If the object is stuck, but it was forcefully flung away from the target, // If the object is stuck, but it was forcefully flung away from the target in
// tell the listener so the object can be animated out of the target. // the upward direction, tell the listener so the object can be animated out of
// the target.
magnetListener.onUnstuckFromTarget( magnetListener.onUnstuckFromTarget(
targetObjectIsStuckTo!!, velX, velY, wasFlungOut = true) targetObjectIsStuckTo!!, velX, velY, wasFlungOut = true)
} else { } else {