diff options
| author | Justin Koh <justinkoh@google.com> | 2014-05-05 22:38:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-05 22:38:13 +0000 |
| commit | fd04632ab5fe9272b0f1d2ff94367a574e026a5b (patch) | |
| tree | bb636c022779e3ae9d22921e2ae65dcff7456c0f /core/java | |
| parent | 68ca14648c88d84080cafae02c9bc5cf3448096a (diff) | |
| parent | 3caf92582498bad8fe79f6e3235be218e82b7f68 (diff) | |
am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev
* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
Hide getDeviceGlobalActionKeyTimeout
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewConfiguration.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 4b8541eb710d..802c6667fc30 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -702,8 +702,9 @@ public class ViewConfiguration { * * @return how long a user needs to press the relevant key to bring up * the global actions dialog. - * @deprecated use getDeviceGlobalActionKeyTimeout + * @deprecated */ + @Deprecated public static long getGlobalActionKeyTimeout() { return GLOBAL_ACTIONS_KEY_TIMEOUT; } @@ -714,6 +715,7 @@ public class ViewConfiguration { * * @return how long a user needs to press the relevant key to bring up * the global actions dialog. + * @hide */ public long getDeviceGlobalActionKeyTimeout() { return mGlobalActionsKeyTimeout; |