diff options
| -rw-r--r-- | api/current.xml | 613 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 7 | ||||
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 4 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 | ||||
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 6 | ||||
| -rw-r--r-- | core/java/android/widget/HorizontalScrollView.java | 5 | ||||
| -rw-r--r-- | core/java/android/widget/ListView.java | 4 | ||||
| -rw-r--r-- | core/java/android/widget/OverScroller.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 5 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 7 |
10 files changed, 114 insertions, 542 deletions
diff --git a/api/current.xml b/api/current.xml index 86469c9..8bb69ea 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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" diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index e88c75f..919ac6c 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -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) { diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index fd51a22..aa1da7c 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -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; diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 196939e..266a118 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2524,6 +2524,9 @@ public class WebView extends AbsoluteLayout } @Override + /* + * @hide + */ protected void onOverscrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { mInOverScrollMode = false; diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 29d3be3..39d2387 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -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() { @@ -2406,7 +2407,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te return true; } - + + /* + * @hide + */ @Override protected void onOverscrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 78a6526..8d7b6d5 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -585,7 +585,10 @@ public class HorizontalScrollView extends FrameLayout { } } } - + + /* + * @hide + */ @Override protected void onOverscrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 5635945..5432ee4 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -3240,6 +3240,7 @@ public class ListView extends AbsListView { * Sets the drawable that will be drawn above all other list content. * This area can become visible when the user overscrolls the list. * + * @hide * @param header The drawable to use */ public void setOverscrollHeader(Drawable header) { @@ -3250,6 +3251,7 @@ public class ListView extends AbsListView { } /** + * @hide * @return The drawable that will be drawn above all other list content */ public Drawable getOverscrollHeader() { @@ -3261,6 +3263,7 @@ public class ListView extends AbsListView { * This area can become visible when the user overscrolls the list, * or when the list's content does not fully fill the container area. * + * @hide * @param footer The drawable to use */ public void setOverscrollFooter(Drawable footer) { @@ -3269,6 +3272,7 @@ public class ListView extends AbsListView { } /** + * @hide * @return The drawable that will be drawn below all other list content */ public Drawable getOverscrollFooter() { diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java index abd305f..2e22dad 100644 --- a/core/java/android/widget/OverScroller.java +++ b/core/java/android/widget/OverScroller.java @@ -26,6 +26,8 @@ import android.widget.Scroller.MagneticScroller; * This class encapsulates scrolling with the ability to overshoot the bounds * of a scrolling operation. This class is a drop-in replacement for * {@link android.widget.Scroller} in most cases. + * + * @hide */ public class OverScroller { private int mMode; diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 2f1bc17..afa0e58 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -582,7 +582,10 @@ public class ScrollView extends FrameLayout { } } } - + + /* + * @hide + */ @Override protected void onOverscrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index a12f21c..42961de 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1315,7 +1315,8 @@ <!-- Defines overscrolling behavior. This property is used only if the View is scrollable. Overscrolling is the ability for the user to - scroll a View beyond its content boundaries into empty space. --> + scroll a View beyond its content boundaries into empty space. + @hide --> <attr name="overscrollMode"> <!-- Always allow the user to overscroll the content. --> <enum name="always" value="0" /> @@ -1758,9 +1759,9 @@ <!-- When set to false, the ListView will not draw the divider before each footer view. The default value is true. --> <attr name="footerDividersEnabled" format="boolean" /> - <!-- Drawable to draw above list content. --> + <!-- Drawable to draw above list content. @hide --> <attr name="overscrollHeader" format="reference|color" /> - <!-- Drawable to draw below list content. --> + <!-- Drawable to draw below list content. @hide --> <attr name="overscrollFooter" format="reference|color" /> </declare-styleable> <declare-styleable name="MenuView"> |