summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--core/api/current.txt1
-rw-r--r--core/java/android/view/ViewConfiguration.java1
3 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 9ff7cc255bf4..dc3277b75d1b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -55096,6 +55096,7 @@ package android.view {
method @Deprecated public static int getMaximumDrawingCacheSize();
method @Deprecated public static int getMaximumFlingVelocity();
method @Deprecated public static int getMinimumFlingVelocity();
+ method public static int getMultiPressTimeout();
method public static int getPressedStateDuration();
method @FloatRange(from=1.0) public float getScaledAmbiguousGestureMultiplier();
method public int getScaledDoubleTapSlop();
diff --git a/core/api/current.txt b/core/api/current.txt
index 16a5f5e82f21..350553cff411 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -53214,6 +53214,7 @@ package android.view {
method @Deprecated public static int getMaximumDrawingCacheSize();
method @Deprecated public static int getMaximumFlingVelocity();
method @Deprecated public static int getMinimumFlingVelocity();
+ method public static int getMultiPressTimeout();
method public static int getPressedStateDuration();
method @FloatRange(from=1.0) public float getScaledAmbiguousGestureMultiplier();
method public int getScaledDoubleTapSlop();
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java
index 16211fcecdf4..c2f17c310363 100644
--- a/core/java/android/view/ViewConfiguration.java
+++ b/core/java/android/view/ViewConfiguration.java
@@ -604,7 +604,6 @@ public class ViewConfiguration {
/**
* @return the duration in milliseconds between the first tap's up event and the second tap's
* down event for an interaction to be considered part of the same multi-press.
- * @hide
*/
public static int getMultiPressTimeout() {
return AppGlobals.getIntCoreSetting(Settings.Secure.MULTI_PRESS_TIMEOUT,