am 50035e83: am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev

* commit '50035e83963a20e91a764054004fbda8f0a85807':
  Move lockscreen to using haptic feedback setting.
This commit is contained in:
Jeff Sharkey
2012-10-10 17:23:09 -07:00
committed by Android Git Automerger
4 changed files with 13 additions and 13 deletions

View File

@@ -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,