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

Commit f8629697 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Hide overscroll APIs 

There's no reason for these to be public, other than asking for trouble.

Change-Id: Ic0d262e4f016752d8393a4aefcefb45a993cd801
parent 6493542c

api/current.xml

+77 −536
Original line number Diff line number Diff line
@@ -5938,39 +5938,6 @@ 
 visibility="public"

>

</field>

<field name="overscrollFooter"

 type="int"

 transient="false"

 volatile="false"

 value="16843456"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="overscrollHeader"

 type="int"

 transient="false"

 volatile="false"

 value="16843455"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="overscrollMode"

 type="int"

 transient="false"

 volatile="false"

 value="16843457"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="padding"

 type="int"

 transient="false"
@@ -74925,7 +74892,7 @@ 
 type="float"

 transient="false"

 volatile="false"

 value="0.0010f"

 value="0.001f"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -176410,17 +176377,6 @@ 
 visibility="public"

>

</method>

<method name="getOverscrollMode"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getPaddingBottom"

 return="int"

 abstract="false"
@@ -177561,25 +177517,6 @@ 
<parameter name="heightMeasureSpec" type="int">

</parameter>

</method>

<method name="onOverscrolled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="scrollX" type="int">

</parameter>

<parameter name="scrollY" type="int">

</parameter>

<parameter name="clampedX" type="boolean">

</parameter>

<parameter name="clampedY" type="boolean">

</parameter>

</method>

<method name="onRestoreInstanceState"

 return="void"

 abstract="false"
@@ -177733,35 +177670,6 @@ 
<parameter name="visibility" type="int">

</parameter>

</method>

<method name="overscrollBy"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="deltaX" type="int">

</parameter>

<parameter name="deltaY" type="int">

</parameter>

<parameter name="scrollX" type="int">

</parameter>

<parameter name="scrollY" type="int">

</parameter>

<parameter name="scrollRangeX" type="int">

</parameter>

<parameter name="scrollRangeY" type="int">

</parameter>

<parameter name="maxOverscrollX" type="int">

</parameter>

<parameter name="maxOverscrollY" type="int">

</parameter>

<parameter name="isTouchEvent" type="boolean">

</parameter>

</method>

<method name="performClick"

 return="boolean"

 abstract="false"
@@ -178588,19 +178496,6 @@ 
<parameter name="l" type="android.view.View.OnTouchListener">

</parameter>

</method>

<method name="setOverscrollMode"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="overscrollMode" type="int">

</parameter>

</method>

<method name="setPadding"

 return="void"

 abstract="false"
@@ -179223,39 +179118,6 @@ 
 visibility="public"

>

</field>

<field name="OVERSCROLL_ALWAYS"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OVERSCROLL_IF_CONTENT_SCROLLS"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OVERSCROLL_NEVER"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PRESSED_ENABLED_FOCUSED_SELECTED_STATE_SET"

 type="int[]"

 transient="false"
@@ -194100,17 +193962,6 @@ 
 visibility="public"

>

</method>

<method name="getUseWebViewBackgroundForOverscrollBackground"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getUseWideViewPort"

 return="boolean"

 abstract="false"
@@ -194703,19 +194554,6 @@ 
<parameter name="use" type="boolean">

</parameter>

</method>

<method name="setUseWebViewBackgroundForOverscrollBackground"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="view" type="boolean">

</parameter>

</method>

<method name="setUseWideViewPort"

 return="void"

 abstract="false"
@@ -195874,6 +195712,25 @@ 
<parameter name="newFocus" type="android.view.View">

</parameter>

</method>

<method name="onOverscrolled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="scrollX" type="int">

</parameter>

<parameter name="scrollY" type="int">

</parameter>

<parameter name="clampedX" type="boolean">

</parameter>

<parameter name="clampedY" type="boolean">

</parameter>

</method>

<method name="overlayHorizontalScrollbar"

 return="boolean"

 abstract="false"
@@ -197330,6 +197187,25 @@ 
 visibility="public"

>

</method>

<method name="onOverscrolled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="scrollX" type="int">

</parameter>

<parameter name="scrollY" type="int">

</parameter>

<parameter name="clampedX" type="boolean">

</parameter>

<parameter name="clampedY" type="boolean">

</parameter>

</method>

<method name="onRestoreInstanceState"

 return="void"

 abstract="false"
@@ -204172,6 +204048,25 @@ 
 visibility="public"

>

</method>

<method name="onOverscrolled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="scrollX" type="int">

</parameter>

<parameter name="scrollY" type="int">

</parameter>

<parameter name="clampedX" type="boolean">

</parameter>

<parameter name="clampedY" type="boolean">

</parameter>

</method>

<method name="pageScroll"

 return="boolean"

 abstract="false"
@@ -205326,28 +205221,6 @@ 
 visibility="public"

>

</method>

<method name="getOverscrollFooter"

 return="android.graphics.drawable.Drawable"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getOverscrollHeader"

 return="android.graphics.drawable.Drawable"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isItemChecked"

 return="boolean"

 abstract="false"
@@ -205493,32 +205366,6 @@ 
<parameter name="itemsCanFocus" type="boolean">

</parameter>

</method>

<method name="setOverscrollFooter"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="footer" type="android.graphics.drawable.Drawable">

</parameter>

</method>

<method name="setOverscrollHeader"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="header" type="android.graphics.drawable.Drawable">

</parameter>

</method>

<method name="setSelection"

 return="void"

 abstract="false"
@@ -206090,331 +205937,6 @@ 
</parameter>

</method>

</interface>

<class name="OverScroller"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="OverScroller"

 type="android.widget.OverScroller"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

</constructor>

<constructor name="OverScroller"

 type="android.widget.OverScroller"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="interpolator" type="android.view.animation.Interpolator">

</parameter>

</constructor>

<constructor name="OverScroller"

 type="android.widget.OverScroller"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="interpolator" type="android.view.animation.Interpolator">

</parameter>

<parameter name="bounceCoefficientX" type="float">

</parameter>

<parameter name="bounceCoefficientY" type="float">

</parameter>

</constructor>

<method name="abortAnimation"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="computeScrollOffset"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="fling"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="startX" type="int">

</parameter>

<parameter name="startY" type="int">

</parameter>

<parameter name="velocityX" type="int">

</parameter>

<parameter name="velocityY" type="int">

</parameter>

<parameter name="minX" type="int">

</parameter>

<parameter name="maxX" type="int">

</parameter>

<parameter name="minY" type="int">

</parameter>

<parameter name="maxY" type="int">

</parameter>

</method>

<method name="fling"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="startX" type="int">

</parameter>

<parameter name="startY" type="int">

</parameter>

<parameter name="velocityX" type="int">

</parameter>

<parameter name="velocityY" type="int">

</parameter>

<parameter name="minX" type="int">

</parameter>

<parameter name="maxX" type="int">

</parameter>

<parameter name="minY" type="int">

</parameter>

<parameter name="maxY" type="int">

</parameter>

<parameter name="overX" type="int">

</parameter>

<parameter name="overY" type="int">

</parameter>

</method>

<method name="forceFinished"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="finished" type="boolean">

</parameter>

</method>

<method name="getCurrX"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getCurrY"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getFinalX"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getFinalY"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getStartX"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getStartY"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isFinished"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isOverscrolled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="notifyHorizontalEdgeReached"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="startX" type="int">

</parameter>

<parameter name="finalX" type="int">

</parameter>

<parameter name="overX" type="int">

</parameter>

</method>

<method name="notifyVerticalEdgeReached"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="startY" type="int">

</parameter>

<parameter name="finalY" type="int">

</parameter>

<parameter name="overY" type="int">

</parameter>

</method>

<method name="springback"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="startX" type="int">

</parameter>

<parameter name="startY" type="int">

</parameter>

<parameter name="minX" type="int">

</parameter>

<parameter name="maxX" type="int">

</parameter>

<parameter name="minY" type="int">

</parameter>

<parameter name="maxY" type="int">

</parameter>

</method>

<method name="startScroll"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="startX" type="int">

</parameter>

<parameter name="startY" type="int">

</parameter>

<parameter name="dx" type="int">

</parameter>

<parameter name="dy" type="int">

</parameter>

</method>

<method name="startScroll"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="startX" type="int">

</parameter>

<parameter name="startY" type="int">

</parameter>

<parameter name="dx" type="int">

</parameter>

<parameter name="dy" type="int">

</parameter>

<parameter name="duration" type="int">

</parameter>

</method>

</class>

<class name="PopupWindow"

 extends="java.lang.Object"

 abstract="false"
@@ -209237,6 +208759,25 @@ 
 visibility="public"

>

</method>

<method name="onOverscrolled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="protected"

>

<parameter name="scrollX" type="int">

</parameter>

<parameter name="scrollY" type="int">

</parameter>

<parameter name="clampedX" type="boolean">

</parameter>

<parameter name="clampedY" type="boolean">

</parameter>

</method>

<method name="pageScroll"

 return="boolean"

 abstract="false"

core/java/android/view/View.java

+7 −0
Original line number Diff line number Diff line
@@ -1525,6 +1525,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * Always allow a user to overscroll this view, provided it is a

     * view that can scroll.

     * 

     * @hide

     * @see #getOverscrollMode()

     * @see #setOverscrollMode(int)

     */
@@ -1534,6 +1535,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * Allow a user to overscroll this view only if the content is large

     * enough to meaningfully scroll, provided it is a view that can scroll.

     * 

     * @hide

     * @see #getOverscrollMode()

     * @see #setOverscrollMode(int)

     */
@@ -1542,6 +1544,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
    /**

     * Never allow a user to overscroll this view.

     * 

     * @hide

     * @see #getOverscrollMode()

     * @see #setOverscrollMode(int)

     */
@@ -8714,6 +8717,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * 

     * Views can use this method to handle any touch or fling-based scrolling.

     * 

     * @hide

     * @param deltaX Change in X in pixels 

     * @param deltaY Change in Y in pixels

     * @param scrollX Current X scroll value in pixels before applying deltaX
@@ -8819,6 +8823,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * Called by {@link #overscrollBy(int, int, int, int, int, int, int, int, boolean)} to

     * respond to the results of an overscroll operation.

     * 

     * @hide

     * @param scrollX New X scroll value in pixels

     * @param scrollY New Y scroll value in pixels

     * @param clampedX True if scrollX was clamped to an overscroll boundary
@@ -8835,6 +8840,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * (allow overscrolling only if the view content is larger than the container),

     * or {@link #OVERSCROLL_NEVER}.

     * 

     * @hide

     * @return This view's overscroll mode.

     */

    public int getOverscrollMode() {
@@ -8854,6 +8860,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * Setting the overscroll mode of a view will have an effect only if the

     * view is capable of scrolling.

     * 

     * @hide

     * @param overscrollMode The new overscroll mode for this view.

     */

    public void setOverscrollMode(int overscrollMode) {

core/java/android/webkit/WebSettings.java

+4 −0
Original line number Diff line number Diff line
@@ -498,6 +498,8 @@ public class WebSettings { 
     * Set whether the WebView uses its background for over scroll background.

     * If true, it will use the WebView's background. If false, it will use an

     * internal pattern. Default is true.

     *

     * @hide

     */

    public void setUseWebViewBackgroundForOverscrollBackground(boolean view) {

        mUseWebViewBackgroundOverscrollBackground = view;
@@ -506,6 +508,8 @@ public class WebSettings { 
    /**

     * Returns true if this WebView uses WebView's background instead of

     * internal pattern for over scroll background.

     *

     * @hide

     */

    public boolean getUseWebViewBackgroundForOverscrollBackground() {

        return mUseWebViewBackgroundOverscrollBackground;

core/java/android/webkit/WebView.java

+3 −0
Original line number Diff line number Diff line
@@ -2524,6 +2524,9 @@ public class WebView extends AbsoluteLayout 
    }



    @Override

    /* 

     * @hide 

     */

    protected void onOverscrolled(int scrollX, int scrollY, boolean clampedX,

            boolean clampedY) {

        mInOverScrollMode = false;

core/java/android/widget/AbsListView.java

+5 −1
Original line number Diff line number Diff line
@@ -1298,6 +1298,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
    /**

     * Returns the overscroll weight for this view

     *

     * @hide

     * @return This view's overscroll weight.

     */

    public int getOverscrollWeight() {
@@ -2407,6 +2408,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        return true;

    }

   

	/*

     * @hide

     */ 

    @Override

    protected void onOverscrolled(int scrollX, int scrollY,

            boolean clampedX, boolean clampedY) {