diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-12 14:26:31 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-10-12 14:26:31 -0700 |
| commit | 723a725e790d269f32980116e775d3d7f0037865 (patch) | |
| tree | 661c6873569c38d3bfe692cfe02b3fa49ac648e0 /core/java/com/android/internal/widget/RotarySelector.java | |
| parent | 4c76ea6b88fad2b0147c050c02c6fd3d886d6743 (diff) | |
| download | frameworks_base-723a725e790d269f32980116e775d3d7f0037865.zip frameworks_base-723a725e790d269f32980116e775d3d7f0037865.tar.gz frameworks_base-723a725e790d269f32980116e775d3d7f0037865.tar.bz2 | |
Make all lockscreen widgets follow haptic flag.
Bug: 7337006
Change-Id: I782e498b7528e612c4b06a75b77f5521c951cbd6
Diffstat (limited to 'core/java/com/android/internal/widget/RotarySelector.java')
| -rw-r--r-- | core/java/com/android/internal/widget/RotarySelector.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/core/java/com/android/internal/widget/RotarySelector.java b/core/java/com/android/internal/widget/RotarySelector.java index a2a38dc..4e405f4 100644 --- a/core/java/com/android/internal/widget/RotarySelector.java +++ b/core/java/com/android/internal/widget/RotarySelector.java @@ -25,7 +25,9 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Matrix; import android.graphics.drawable.Drawable; +import android.os.UserHandle; import android.os.Vibrator; +import android.provider.Settings; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; @@ -667,11 +669,16 @@ public class RotarySelector extends View { * Triggers haptic feedback. */ private synchronized void vibrate(long duration) { - if (mVibrator == null) { - mVibrator = (android.os.Vibrator) - getContext().getSystemService(Context.VIBRATOR_SERVICE); + final boolean hapticEnabled = Settings.System.getIntForUser( + mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, 1, + UserHandle.USER_CURRENT) != 0; + if (hapticEnabled) { + if (mVibrator == null) { + mVibrator = (android.os.Vibrator) getContext() + .getSystemService(Context.VIBRATOR_SERVICE); + } + mVibrator.vibrate(duration); } - mVibrator.vibrate(duration); } /** |