diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-02 14:32:37 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-10-02 14:32:37 +0100 |
| commit | c2a0b4482d7144e8382346ea4c22c7b89368fec0 (patch) | |
| tree | f0ec3fbeee8dde1d56ad85c59d858ec093d5eb9d /core/java/android/gesture/GestureOverlayView.java | |
| parent | f08384c763d2e57c05e0be4325c267d12fc516d4 (diff) | |
| parent | ee665151a4c6359cbfbb9a6795aa9097c4622083 (diff) | |
| download | frameworks_base-c2a0b4482d7144e8382346ea4c22c7b89368fec0.zip frameworks_base-c2a0b4482d7144e8382346ea4c22c7b89368fec0.tar.gz frameworks_base-c2a0b4482d7144e8382346ea4c22c7b89368fec0.tar.bz2 | |
resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
Diffstat (limited to 'core/java/android/gesture/GestureOverlayView.java')
| -rw-r--r-- | core/java/android/gesture/GestureOverlayView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/gesture/GestureOverlayView.java b/core/java/android/gesture/GestureOverlayView.java index 6e3a00f..e1a2a25 100644 --- a/core/java/android/gesture/GestureOverlayView.java +++ b/core/java/android/gesture/GestureOverlayView.java @@ -640,7 +640,7 @@ public class GestureOverlayView extends FrameLayout { mStrokeBuffer.add(new GesturePoint(x, y, event.getEventTime())); if (mHandleGestureActions && !mIsGesturing) { - mTotalLength += (float) Math.sqrt(dx * dx + dy * dy); + mTotalLength += (float) Math.hypot(dx, dy); if (mTotalLength > mGestureStrokeLengthThreshold) { final OrientedBoundingBox box = |