summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-10-10 14:28:27 -0700
committerJeff Sharkey <jsharkey@android.com>2012-10-10 16:08:47 -0700
commit5ed9d680409c83fbfd7b617d7f257305d3c34b62 (patch)
tree20e6b013f2d233fccaa32646306e36ec3a34630c /api
parent0dd0b1447c28f095265c6c108ccb7cdb4f87832c (diff)
downloadframeworks_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 'api')
-rw-r--r--api/17.txt2
-rw-r--r--api/current.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/17.txt b/api/17.txt
index bebd566..9af3b49 100644
--- a/api/17.txt
+++ b/api/17.txt
@@ -18905,7 +18905,7 @@ package android.provider {
field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
field public static final java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
field public static final java.lang.String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
- field public static final java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
+ field public static final deprecated java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
field public static final java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
field public static final deprecated java.lang.String LOGGING_ID = "logging_id";
field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference";
diff --git a/api/current.txt b/api/current.txt
index bebd566..9af3b49 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18905,7 +18905,7 @@ package android.provider {
field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
field public static final java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
field public static final java.lang.String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
- field public static final java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
+ field public static final deprecated java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
field public static final java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
field public static final deprecated java.lang.String LOGGING_ID = "logging_id";
field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference";