Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15b9de8c authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 1d5b3a63: Fix the build 

Merge commit '1d5b3a63' into eclair-mr2

* commit '1d5b3a63':
  Fix the build
parents b31174de 1d5b3a63

api/current.xml

+13 −0
Original line number Diff line number Diff line
@@ -159210,6 +159210,19 @@ 
<parameter name="canvas" type="android.graphics.Canvas">

</parameter>

</method>

<method name="onDrawScrollBars"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="canvas" type="android.graphics.Canvas">

</parameter>

</method>

<method name="onFinishInflate"

 return="void"

 abstract="false"

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -5549,7 +5549,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * 

     * @see #awakenScrollBars(int)

     */

    private void onDrawScrollBars(Canvas canvas) {

    protected final void onDrawScrollBars(Canvas canvas) {

        // scrollbars are drawn only when the animation is running

        final ScrollabilityCache cache = mScrollCache;

        if (cache != null) {