diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-10 16:32:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 16:32:36 -0700 |
| commit | 50035e83963a20e91a764054004fbda8f0a85807 (patch) | |
| tree | 11fc3d0485975e8a283d928403bdfc1bf6740f14 /api | |
| parent | ef0eaa5e661d9eb21974c290a121b35fc78b8bcb (diff) | |
| parent | 89be4267d0a23ca258af607291bc4f905f963185 (diff) | |
| download | frameworks_base-50035e83963a20e91a764054004fbda8f0a85807.zip frameworks_base-50035e83963a20e91a764054004fbda8f0a85807.tar.gz frameworks_base-50035e83963a20e91a764054004fbda8f0a85807.tar.bz2 | |
am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
* commit '89be4267d0a23ca258af607291bc4f905f963185':
Move lockscreen to using haptic feedback setting.
Diffstat (limited to 'api')
| -rw-r--r-- | api/17.txt | 2 | ||||
| -rw-r--r-- | api/current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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"; |