diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-10 16:26:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 16:26:49 -0700 |
| commit | 03bd101b887d9741230ac6a7d296d90436020b8c (patch) | |
| tree | 15ff527f460d2a2a7a034a11c0e5041b14210e88 /core | |
| parent | 1dbce5f1e55bdc61a767cd82b59a3919a4683b5e (diff) | |
| parent | 5ed9d680409c83fbfd7b617d7f257305d3c34b62 (diff) | |
| download | frameworks_base-03bd101b887d9741230ac6a7d296d90436020b8c.zip frameworks_base-03bd101b887d9741230ac6a7d296d90436020b8c.tar.gz frameworks_base-03bd101b887d9741230ac6a7d296d90436020b8c.tar.bz2 | |
Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 12 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3c4a8fe..00ea873 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3197,10 +3197,16 @@ public final class Settings { public static final String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern"; /** - * Whether lock pattern will vibrate as user enters (0 = false, 1 = true) + * Whether lock pattern will vibrate as user enters (0 = false, 1 = + * true) + * + * @deprecated Starting in {@link VERSION_CODES#JELLY_BEAN_MR1} the + * lockscreen uses + * {@link Settings.System#HAPTIC_FEEDBACK_ENABLED}. */ - public static final String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = - "lock_pattern_tactile_feedback_enabled"; + @Deprecated + public static final String + LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled"; /** * This preference allows the device to be locked given time after screen goes off, 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; } /** |