diff options
| author | Justin Koh <justinkoh@google.com> | 2014-05-04 12:13:25 -0700 |
|---|---|---|
| committer | Justin Koh <justinkoh@google.com> | 2014-05-05 14:40:56 -0700 |
| commit | 1aa59f86ca63769f5b5c9b6be9078911e24998e9 (patch) | |
| tree | e10b9151dd60692371d975f30fbe6b4dc71d1fcd | |
| parent | 34dd2cdd4142ca8c7463b9f831429b4366fa222a (diff) | |
| download | frameworks_base-1aa59f86ca63769f5b5c9b6be9078911e24998e9.zip frameworks_base-1aa59f86ca63769f5b5c9b6be9078911e24998e9.tar.gz frameworks_base-1aa59f86ca63769f5b5c9b6be9078911e24998e9.tar.bz2 | |
Hide getDeviceGlobalActionKeyTimeout
Hide getDeviceGlobalActionKeyTimeout, as requested. Remove mention from
@deprecated notice.
Bug: 14441321
Change-Id: Ic6e84e718c2eaa15a86d8cd4d13645be88490b61
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/ViewConfiguration.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 2638ee4..1d925d5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28382,7 +28382,6 @@ package android.view { public class ViewConfiguration { ctor public deprecated ViewConfiguration(); method public static android.view.ViewConfiguration get(android.content.Context); - method public long getDeviceGlobalActionKeyTimeout(); method public static int getDoubleTapTimeout(); method public static deprecated int getEdgeSlop(); method public static deprecated int getFadingEdgeLength(); diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 4b8541e..802c666 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; |