diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-10 14:28:27 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-10-10 16:08:47 -0700 |
| commit | 5ed9d680409c83fbfd7b617d7f257305d3c34b62 (patch) | |
| tree | 20e6b013f2d233fccaa32646306e36ec3a34630c /core/java/com/android | |
| parent | 0dd0b1447c28f095265c6c108ccb7cdb4f87832c (diff) | |
| download | frameworks_base-5ed9d680409c83fbfd7b617d7f257305d3c34b62.zip frameworks_base-5ed9d680409c83fbfd7b617d7f257305d3c34b62.tar.gz frameworks_base-5ed9d680409c83fbfd7b617d7f257305d3c34b62.tar.bz2 | |
Move lockscreen to using haptic feedback setting.
This removes lockscreen-specific "Vibrate on touch" setting, and
changes it to use the haptic feedback setting instead.
Bug: 7318772
Change-Id: I637c392a1aaa22403cb20da4723f90c3b2e3de19
Diffstat (limited to 'core/java/com/android')
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index d14b1ee..3f40f20 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -949,14 +949,8 @@ public class LockPatternUtils { * @return Whether tactile feedback for the pattern is enabled. */ public boolean isTactileFeedbackEnabled() { - return getBoolean(Settings.Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED, false); - } - - /** - * Set whether tactile feedback for the pattern is enabled. - */ - public void setTactileFeedbackEnabled(boolean enabled) { - setBoolean(Settings.Secure.LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED, enabled); + return Settings.System.getIntForUser(mContentResolver, + Settings.System.HAPTIC_FEEDBACK_ENABLED, 1, UserHandle.USER_CURRENT) != 0; } /** |