diff options
| author | Danesh Mondegarian <daneshm90@gmail.com> | 2012-12-12 00:08:14 -0500 |
|---|---|---|
| committer | Danesh Mondegarian <daneshm90@gmail.com> | 2012-12-12 00:13:00 -0500 |
| commit | 8d037a2ded2edafc2ecafad2a8d799cb3f82f629 (patch) | |
| tree | 54e40caea1fb480c4748afa9b16fa42b660c49e6 /core/java/com | |
| parent | 6c356cc418765aa0402a940392ae5f06e188e972 (diff) | |
| download | frameworks_base-8d037a2ded2edafc2ecafad2a8d799cb3f82f629.zip frameworks_base-8d037a2ded2edafc2ecafad2a8d799cb3f82f629.tar.gz frameworks_base-8d037a2ded2edafc2ecafad2a8d799cb3f82f629.tar.bz2 | |
GlowPadView : Re-enable magneticTargets
Re-enable magneticTargets and add logic to make it
compatible with lockscreen shortcuts.
Change-Id: I523141f03566804888fde08a116f73ea62ca523e
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/multiwaveview/GlowPadView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java index 8763df7..ec28e62 100644 --- a/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java +++ b/core/java/com/android/internal/widget/multiwaveview/GlowPadView.java @@ -951,6 +951,11 @@ public class GlowPadView extends View { if (angleMatches && (dist2(tx, ty) > snapDistance2)) { activeTarget = i; activeAngle = (float) -angleRad; + break; + } else if (dist2(tx, ty) > snapDistance2 && + mMagneticTargets && activeTarget == -1) { + activeTarget = 0; + activeAngle = (float) -angleRad; } } } @@ -970,7 +975,6 @@ public class GlowPadView extends View { switchToState(STATE_TRACKING, x, y); updateGlowPosition(x, y); } - if (mActiveTarget != activeTarget) { // Defocus the old target if (mActiveTarget != -1) { @@ -988,7 +992,7 @@ public class GlowPadView extends View { if (target.hasState(TargetDrawable.STATE_FOCUSED)) { target.setState(TargetDrawable.STATE_FOCUSED); } - if (mMagneticTargets) { + if (mMagneticTargets && activeTarget <= 0) { updateTargetPosition(activeTarget, mWaveCenterX, mWaveCenterY, activeAngle); } if (AccessibilityManager.getInstance(mContext).isEnabled()) { |