From 25f0e6183b632e6f2ba1963e3a4e94c27824dce7 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Fri, 27 Feb 2015 12:34:30 -0800 Subject: Revert "Use ObjectAnimator for fading scrollbars, set initial duration to 1500" Bug: 19522833 Bug: 19528265 This reverts commit 72710f11ecd3baf468bf649283453cb7aafe4d74. Change-Id: I7235ae3ca53696f029cc18f19fe1d373c4f54bbf --- core/java/android/view/ViewConfiguration.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'core/java/android/view/ViewConfiguration.java') diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index d7335137140e..4e91ad4db977 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -46,12 +46,6 @@ public class ViewConfiguration { */ private static final int SCROLL_BAR_DEFAULT_DELAY = 300; - /** - * Default delay before the scrollbars fade in milliseconds for the first - * time they are shown to the user. - */ - private static final int SCROLL_BAR_DEFAULT_INITIAL_DELAY = 1500; - /** * Defines the length of the fading edges in dips */ @@ -401,22 +395,12 @@ public class ViewConfiguration { } /** - * @return Default delay in milliseconds before the scrollbars fade out - * after they have been awoken. + * @return Default delay before the scrollbars fade in milliseconds */ public static int getScrollDefaultDelay() { return SCROLL_BAR_DEFAULT_DELAY; } - /** - * @return Default delay in milliseconds before the scrollbars fade out - * after they are initially shown to the user. - * @hide Pending cleanup of ViewConfiguration values. - */ - public static int getScrollDefaultInitialDelay() { - return SCROLL_BAR_DEFAULT_INITIAL_DELAY; - } - /** * @return the length of the fading edges in dips * -- cgit v1.2.3