am 3ecd58c6: Fix build

Merge commit '3ecd58c650371206008efd687933c370e4e28a34' into eclair-plus-aosp

* commit '3ecd58c650371206008efd687933c370e4e28a34':
  Fix build

api/current.xml

@@ -3485,6 +3485,17 @@
  visibility="public"
 >
 </field>
+<field name="fadeScrollbars"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843434"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="fadingEdge"
  type="int"
  transient="false"
@@ -6763,6 +6774,28 @@
  visibility="public"
 >
 </field>
+<field name="scrollbarDefaultDelayBeforeFade"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843433"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="scrollbarFadeDuration"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843432"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="scrollbarSize"
  type="int"
  transient="false"
@@ -155253,6 +155286,30 @@
 <parameter name="views" type="java.util.ArrayList&lt;android.view.View&gt;">
 </parameter>
 </method>
+<method name="awakenScrollBars"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</method>
+<method name="awakenScrollBars"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+<parameter name="startDelay" type="int">
+</parameter>
+</method>
 <method name="bringToFront"
  return="void"
  abstract="false"
@@ -159687,6 +159744,17 @@
  visibility="public"
 >
 </method>
+<method name="getScrollBarFadeDuration"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getScrollBarSize"
  return="int"
  abstract="false"
@@ -159698,6 +159766,17 @@
  visibility="public"
 >
 </method>
+<method name="getScrollDefaultDelay"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getScrollFriction"
  return="float"
  abstract="false"

core/java/android/view/View.java

@@ -59,6 +59,7 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityEventSource;
 import android.view.accessibility.AccessibilityManager;
 import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
@@ -4806,7 +4807,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
 
             // Tell mScrollCache when we should start fading. This may
             // extend the fade start time if one was already scheduled
-            long fadeStartTime = SystemClock.uptimeMillis() + startDelay;
+            long fadeStartTime = AnimationUtils.currentAnimationTimeMillis() + startDelay;
             scrollCache.fadeStartTime = fadeStartTime;
             scrollCache.state = ScrollabilityCache.ON;
 
@@ -8993,7 +8994,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
         }
         
         public void run() {
-            long now = SystemClock.uptimeMillis();
+            long now = AnimationUtils.currentAnimationTimeMillis();
             if (now >= fadeStartTime) {
 
                 // the animation fades the scrollbars out by changing