commit 3caf92582498bad8fe79f6e3235be218e82b7f68
author Justin Koh <justinkoh@google.com> Mon May 05 22:33:28 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 05 22:33:29 2014 +0000
tree 8016a152cbad29ae5cc2fe4d116210d9f8587bb3
parent ed23c5bc12b4110435b1e6f5fb9b82716109136e
parent 1aa59f86ca63769f5b5c9b6be9078911e24998e9

Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 2aa94f8..6bf83c0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28379,7 +28379,6 @@
   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();

core/java/android/view/ViewConfiguration.java

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 @@
      *
      * @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 @@
      *
      * @return how long a user needs to press the relevant key to bring up
      *   the global actions dialog.
+     * @hide
      */
     public long getDeviceGlobalActionKeyTimeout() {
         return mGlobalActionsKeyTimeout;