From 737e8fe2c7ce167bc68ad779160488007a5e0b1d Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Tue, 5 Oct 2010 14:37:38 -0700 Subject: [PATCH] DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll Change-Id: If34c8ea4e15697420adad0bc404f3c278efd7c1b --- api/current.xml | 30 ++-- core/java/android/view/View.java | 134 +++++++++--------- core/java/android/webkit/WebView.java | 24 ++-- core/java/android/widget/AbsListView.java | 36 ++--- .../android/widget/HorizontalScrollView.java | 32 ++--- core/java/android/widget/ListView.java | 22 +-- core/java/android/widget/OverScroller.java | 4 +- core/java/android/widget/ScrollView.java | 32 ++--- core/res/res/layout/alert_dialog.xml | 2 +- .../res/layout/preference_dialog_edittext.xml | 2 +- core/res/res/layout/select_dialog.xml | 2 +- core/res/res/values/attrs.xml | 19 +-- core/res/res/values/public.xml | 6 +- .../res/layout/status_bar_expanded.xml | 2 +- 14 files changed, 175 insertions(+), 172 deletions(-) diff --git a/api/current.xml b/api/current.xml index 89a28e2d44a6d..84ccd454c1d7a 100644 --- a/api/current.xml +++ b/api/current.xml @@ -6895,7 +6895,7 @@ visibility="public" > - - - - - - - + - + @@ -188244,7 +188244,7 @@ - - + - - - - - computeHorizontalScrollExtent(); final boolean canScrollVertical = computeVerticalScrollRange() > computeVerticalScrollExtent(); - final boolean overscrollHorizontal = overscrollMode == OVERSCROLL_ALWAYS || - (overscrollMode == OVERSCROLL_IF_CONTENT_SCROLLS && canScrollHorizontal); - final boolean overscrollVertical = overscrollMode == OVERSCROLL_ALWAYS || - (overscrollMode == OVERSCROLL_IF_CONTENT_SCROLLS && canScrollVertical); + final boolean overScrollHorizontal = overScrollMode == OVER_SCROLL_ALWAYS || + (overScrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && canScrollHorizontal); + final boolean overScrollVertical = overScrollMode == OVER_SCROLL_ALWAYS || + (overScrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && canScrollVertical); int newScrollX = scrollX + deltaX; - if (!overscrollHorizontal) { - maxOverscrollX = 0; + if (!overScrollHorizontal) { + maxOverScrollX = 0; } int newScrollY = scrollY + deltaY; - if (!overscrollVertical) { - maxOverscrollY = 0; + if (!overScrollVertical) { + maxOverScrollY = 0; } // Clamp values if at the limits and record - final int left = -maxOverscrollX; - final int right = maxOverscrollX + scrollRangeX; - final int top = -maxOverscrollY; - final int bottom = maxOverscrollY + scrollRangeY; + final int left = -maxOverScrollX; + final int right = maxOverScrollX + scrollRangeX; + final int top = -maxOverScrollY; + final int bottom = maxOverScrollY + scrollRangeY; boolean clampedX = false; if (newScrollX > right) { @@ -8878,55 +8878,55 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility clampedY = true; } - onOverscrolled(newScrollX, newScrollY, clampedX, clampedY); + onOverScrolled(newScrollX, newScrollY, clampedX, clampedY); return clampedX || clampedY; } /** - * Called by {@link #overscrollBy(int, int, int, int, int, int, int, int, boolean)} to - * respond to the results of an overscroll operation. + * Called by {@link #overScrollBy(int, int, int, int, int, int, int, int, boolean)} to + * respond to the results of an over-scroll operation. * * @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 - * @param clampedY True if scrollY was clamped to an overscroll boundary + * @param clampedX True if scrollX was clamped to an over-scroll boundary + * @param clampedY True if scrollY was clamped to an over-scroll boundary */ - protected void onOverscrolled(int scrollX, int scrollY, + protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { // Intentionally empty. } /** - * Returns the overscroll mode for this view. The result will be - * one of {@link #OVERSCROLL_ALWAYS} (default), {@link #OVERSCROLL_IF_CONTENT_SCROLLS} - * (allow overscrolling only if the view content is larger than the container), - * or {@link #OVERSCROLL_NEVER}. + * Returns the over-scroll mode for this view. The result will be + * one of {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} + * (allow over-scrolling only if the view content is larger than the container), + * or {@link #OVER_SCROLL_NEVER}. * - * @return This view's overscroll mode. + * @return This view's over-scroll mode. */ - public int getOverscrollMode() { - return mOverscrollMode; + public int getOverScrollMode() { + return mOverScrollMode; } /** - * Set the overscroll mode for this view. Valid overscroll modes are - * {@link #OVERSCROLL_ALWAYS} (default), {@link #OVERSCROLL_IF_CONTENT_SCROLLS} - * (allow overscrolling only if the view content is larger than the container), - * or {@link #OVERSCROLL_NEVER}. + * Set the over-scroll mode for this view. Valid over-scroll modes are + * {@link #OVER_SCROLL_ALWAYS} (default), {@link #OVER_SCROLL_IF_CONTENT_SCROLLS} + * (allow over-scrolling only if the view content is larger than the container), + * or {@link #OVER_SCROLL_NEVER}. * - * Setting the overscroll mode of a view will have an effect only if the + * Setting the over-scroll mode of a view will have an effect only if the * view is capable of scrolling. * - * @param overscrollMode The new overscroll mode for this view. + * @param overScrollMode The new over-scroll mode for this view. */ - public void setOverscrollMode(int overscrollMode) { - if (overscrollMode != OVERSCROLL_ALWAYS && - overscrollMode != OVERSCROLL_IF_CONTENT_SCROLLS && - overscrollMode != OVERSCROLL_NEVER) { - throw new IllegalArgumentException("Invalid overscroll mode " + overscrollMode); + public void setOverScrollMode(int overScrollMode) { + if (overScrollMode != OVER_SCROLL_ALWAYS && + overScrollMode != OVER_SCROLL_IF_CONTENT_SCROLLS && + overScrollMode != OVER_SCROLL_NEVER) { + throw new IllegalArgumentException("Invalid overscroll mode " + overScrollMode); } - mOverscrollMode = overscrollMode; + mOverScrollMode = overScrollMode; } /** diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 24b1158c6cbd6..6df54458ec68a 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1043,9 +1043,9 @@ public class WebView extends AbsoluteLayout } @Override - public void setOverscrollMode(int mode) { - super.setOverscrollMode(mode); - if (mode != OVERSCROLL_NEVER) { + public void setOverScrollMode(int mode) { + super.setOverScrollMode(mode); + if (mode != OVER_SCROLL_NEVER) { if (mEdgeGlowTop == null) { final Resources res = getContext().getResources(); final Drawable edge = res.getDrawable(R.drawable.overscroll_edge); @@ -2565,7 +2565,7 @@ public class WebView extends AbsoluteLayout } @Override - protected void onOverscrolled(int scrollX, int scrollY, boolean clampedX, + protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { mInOverScrollMode = false; int maxX = computeMaxScrollX(); @@ -2942,12 +2942,12 @@ public class WebView extends AbsoluteLayout if (oldX != x || oldY != y) { final int rangeX = computeMaxScrollX(); final int rangeY = computeMaxScrollY(); - overscrollBy(x - oldX, y - oldY, oldX, oldY, + overScrollBy(x - oldX, y - oldY, oldX, oldY, rangeX, rangeY, mOverflingDistance, mOverflingDistance, false); if (mEdgeGlowTop != null) { - if (rangeY > 0 || getOverscrollMode() == OVERSCROLL_ALWAYS) { + if (rangeY > 0 || getOverScrollMode() == OVER_SCROLL_ALWAYS) { if (y < 0 && oldY >= 0) { mEdgeGlowTop.onAbsorb((int) mScroller.getCurrVelocity()); if (!mEdgeGlowBottom.isFinished()) { @@ -5457,7 +5457,7 @@ public class WebView extends AbsoluteLayout doFling(); break; } else { - if (mScroller.springback(mScrollX, mScrollY, 0, + if (mScroller.springBack(mScrollX, mScrollY, 0, computeMaxScrollX(), 0, computeMaxScrollY())) { invalidate(); @@ -5481,7 +5481,7 @@ public class WebView extends AbsoluteLayout } case MotionEvent.ACTION_CANCEL: { if (mTouchMode == TOUCH_DRAG_MODE) { - mScroller.springback(mScrollX, mScrollY, 0, + mScroller.springBack(mScrollX, mScrollY, 0, computeMaxScrollX(), 0, computeMaxScrollY()); invalidate(); } @@ -5550,7 +5550,7 @@ public class WebView extends AbsoluteLayout final int oldY = mScrollY; final int rangeX = computeMaxScrollX(); final int rangeY = computeMaxScrollY(); - overscrollBy(deltaX, deltaY, oldX, oldY, + overScrollBy(deltaX, deltaY, oldX, oldY, rangeX, rangeY, mOverscrollDistance, mOverscrollDistance, true); @@ -5571,7 +5571,7 @@ public class WebView extends AbsoluteLayout } } - if (rangeY > 0 || getOverscrollMode() == OVERSCROLL_ALWAYS) { + if (rangeY > 0 || getOverScrollMode() == OVER_SCROLL_ALWAYS) { final int pulledToY = oldY + deltaY; if (pulledToY < 0) { mEdgeGlowTop.onPull((float) deltaY / getHeight()); @@ -5990,7 +5990,7 @@ public class WebView extends AbsoluteLayout if ((maxX == 0 && vy == 0) || (maxY == 0 && vx == 0)) { WebViewCore.resumePriority(); WebViewCore.resumeUpdatePicture(mWebViewCore); - if (mScroller.springback(mScrollX, mScrollY, 0, computeMaxScrollX(), + if (mScroller.springBack(mScrollX, mScrollY, 0, computeMaxScrollX(), 0, computeMaxScrollY())) { invalidate(); } @@ -7096,7 +7096,7 @@ public class WebView extends AbsoluteLayout case MotionEvent.ACTION_CANCEL: if (mDeferTouchMode == TOUCH_DRAG_MODE) { // no fling in defer process - mScroller.springback(mScrollX, mScrollY, 0, + mScroller.springBack(mScrollX, mScrollY, 0, computeMaxScrollX(), 0, computeMaxScrollY()); invalidate(); diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 455885451fc53..ee57c6e54c714 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -647,8 +647,8 @@ public abstract class AbsListView extends AdapterView implements Te } @Override - public void setOverscrollMode(int mode) { - if (mode != OVERSCROLL_NEVER) { + public void setOverScrollMode(int mode) { + if (mode != OVER_SCROLL_NEVER) { if (mEdgeGlowTop == null) { final Resources res = getContext().getResources(); final Drawable edge = res.getDrawable(R.drawable.overscroll_edge); @@ -660,7 +660,7 @@ public abstract class AbsListView extends AdapterView implements Te mEdgeGlowTop = null; mEdgeGlowBottom = null; } - super.setOverscrollMode(mode); + super.setOverScrollMode(mode); } /** @@ -2232,16 +2232,16 @@ public abstract class AbsListView extends AdapterView implements Te int overscroll = -incrementalDeltaY - (motionViewRealTop - motionViewPrevTop); - overscrollBy(0, overscroll, 0, mScrollY, 0, 0, + overScrollBy(0, overscroll, 0, mScrollY, 0, 0, 0, mOverscrollDistance, true); if (Math.abs(mOverscrollDistance) == Math.abs(mScrollY)) { // Don't allow overfling if we're at the edge. mVelocityTracker.clear(); } - final int overscrollMode = getOverscrollMode(); - if (overscrollMode == OVERSCROLL_ALWAYS || - (overscrollMode == OVERSCROLL_IF_CONTENT_SCROLLS && + final int overscrollMode = getOverScrollMode(); + if (overscrollMode == OVER_SCROLL_ALWAYS || + (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && !contentFits())) { mDirection = 0; // Reset when entering overscroll. mTouchMode = TOUCH_MODE_OVERSCROLL; @@ -2299,11 +2299,11 @@ public abstract class AbsListView extends AdapterView implements Te mMotionPosition = motionPosition; } } else { - overscrollBy(0, -incrementalDeltaY, 0, mScrollY, 0, 0, + overScrollBy(0, -incrementalDeltaY, 0, mScrollY, 0, 0, 0, mOverscrollDistance, true); - final int overscrollMode = getOverscrollMode(); - if (overscrollMode == OVERSCROLL_ALWAYS || - (overscrollMode == OVERSCROLL_IF_CONTENT_SCROLLS && + final int overscrollMode = getOverScrollMode(); + if (overscrollMode == OVER_SCROLL_ALWAYS || + (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && !contentFits())) { if (rawDeltaY > 0) { mEdgeGlowTop.onPull((float) -incrementalDeltaY / getHeight()); @@ -2542,7 +2542,7 @@ public abstract class AbsListView extends AdapterView implements Te } @Override - protected void onOverscrolled(int scrollX, int scrollY, + protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { mScrollY = scrollY; @@ -2767,7 +2767,7 @@ public abstract class AbsListView extends AdapterView implements Te } void startSpringback() { - if (mScroller.springback(0, mScrollY, 0, 0, 0, 0)) { + if (mScroller.springBack(0, mScrollY, 0, 0, 0, 0)) { mTouchMode = TOUCH_MODE_OVERFLING; invalidate(); post(this); @@ -2787,9 +2787,9 @@ public abstract class AbsListView extends AdapterView implements Te void edgeReached(int delta) { mScroller.notifyVerticalEdgeReached(mScrollY, 0, mOverflingDistance); - final int overscrollMode = getOverscrollMode(); - if (overscrollMode == OVERSCROLL_ALWAYS || - (overscrollMode == OVERSCROLL_IF_CONTENT_SCROLLS && !contentFits())) { + final int overscrollMode = getOverScrollMode(); + if (overscrollMode == OVER_SCROLL_ALWAYS || + (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && !contentFits())) { mTouchMode = TOUCH_MODE_OVERFLING; final int vel = (int) mScroller.getCurrVelocity(); if (delta > 0) { @@ -2875,7 +2875,7 @@ public abstract class AbsListView extends AdapterView implements Te if (motionView != null) { // Tweak the scroll for how far we overshot int overshoot = -(delta - (motionView.getTop() - oldTop)); - overscrollBy(0, overshoot, 0, mScrollY, 0, 0, + overScrollBy(0, overshoot, 0, mScrollY, 0, 0, 0, mOverflingDistance, false); } edgeReached(delta); @@ -2904,7 +2904,7 @@ public abstract class AbsListView extends AdapterView implements Te if (scroller.computeScrollOffset()) { final int scrollY = mScrollY; final int deltaY = scroller.getCurrY() - scrollY; - if (overscrollBy(0, deltaY, 0, scrollY, 0, 0, + if (overScrollBy(0, deltaY, 0, scrollY, 0, 0, 0, mOverflingDistance, false)) { startSpringback(); } else { diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index cd10a59991a4b..6a52f75a1ea64 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -468,7 +468,7 @@ public class HorizontalScrollView extends FrameLayout { /* Release the drag */ mIsBeingDragged = false; mActivePointerId = INVALID_POINTER; - if (mScroller.springback(mScrollX, mScrollY, 0, getScrollRange(), 0, 0)) { + if (mScroller.springBack(mScrollX, mScrollY, 0, getScrollRange(), 0, 0)) { invalidate(); } break; @@ -529,16 +529,16 @@ public class HorizontalScrollView extends FrameLayout { final int oldX = mScrollX; final int oldY = mScrollY; final int range = getScrollRange(); - if (overscrollBy(deltaX, 0, mScrollX, 0, range, 0, + if (overScrollBy(deltaX, 0, mScrollX, 0, range, 0, mOverscrollDistance, 0, true)) { // Break our velocity if we hit a scroll barrier. mVelocityTracker.clear(); } onScrollChanged(mScrollX, mScrollY, oldX, oldY); - final int overscrollMode = getOverscrollMode(); - if (overscrollMode == OVERSCROLL_ALWAYS || - (overscrollMode == OVERSCROLL_IF_CONTENT_SCROLLS && range > 0)) { + final int overscrollMode = getOverScrollMode(); + if (overscrollMode == OVER_SCROLL_ALWAYS || + (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) { final int pulledToX = oldX + deltaX; if (pulledToX < 0) { mEdgeGlowLeft.onPull((float) deltaX / getWidth()); @@ -559,7 +559,7 @@ public class HorizontalScrollView extends FrameLayout { fling(-initialVelocity); } else { final int right = getScrollRange(); - if (mScroller.springback(mScrollX, mScrollY, 0, right, 0, 0)) { + if (mScroller.springBack(mScrollX, mScrollY, 0, right, 0, 0)) { invalidate(); } } @@ -580,7 +580,7 @@ public class HorizontalScrollView extends FrameLayout { break; case MotionEvent.ACTION_CANCEL: if (mIsBeingDragged && getChildCount() > 0) { - if (mScroller.springback(mScrollX, mScrollY, 0, getScrollRange(), 0, 0)) { + if (mScroller.springBack(mScrollX, mScrollY, 0, getScrollRange(), 0, 0)) { invalidate(); } mActivePointerId = INVALID_POINTER; @@ -620,14 +620,14 @@ public class HorizontalScrollView extends FrameLayout { } @Override - protected void onOverscrolled(int scrollX, int scrollY, + protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { // Treat animating scrolls differently; see #computeScroll() for why. if (!mScroller.isFinished()) { mScrollX = scrollX; mScrollY = scrollY; if (clampedX) { - mScroller.springback(mScrollX, mScrollY, 0, getScrollRange(), 0, 0); + mScroller.springBack(mScrollX, mScrollY, 0, getScrollRange(), 0, 0); } } else { super.scrollTo(scrollX, scrollY); @@ -1088,14 +1088,14 @@ public class HorizontalScrollView extends FrameLayout { int y = mScroller.getCurrY(); if (oldX != x || oldY != y) { - overscrollBy(x - oldX, y - oldY, oldX, oldY, getScrollRange(), 0, + overScrollBy(x - oldX, y - oldY, oldX, oldY, getScrollRange(), 0, mOverflingDistance, 0, false); onScrollChanged(mScrollX, mScrollY, oldX, oldY); final int range = getScrollRange(); - final int overscrollMode = getOverscrollMode(); - if (overscrollMode == OVERSCROLL_ALWAYS || - (overscrollMode == OVERSCROLL_IF_CONTENT_SCROLLS && range > 0)) { + final int overscrollMode = getOverScrollMode(); + if (overscrollMode == OVER_SCROLL_ALWAYS || + (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) { if (x < 0 && oldX >= 0) { mEdgeGlowLeft.onAbsorb((int) mScroller.getCurrVelocity()); } else if (x > range && oldX <= range) { @@ -1376,8 +1376,8 @@ public class HorizontalScrollView extends FrameLayout { } @Override - public void setOverscrollMode(int mode) { - if (mode != OVERSCROLL_NEVER) { + public void setOverScrollMode(int mode) { + if (mode != OVER_SCROLL_NEVER) { if (mEdgeGlowLeft == null) { final Resources res = getContext().getResources(); final Drawable edge = res.getDrawable(R.drawable.overscroll_edge); @@ -1389,7 +1389,7 @@ public class HorizontalScrollView extends FrameLayout { mEdgeGlowLeft = null; mEdgeGlowRight = null; } - super.setOverscrollMode(mode); + super.setOverScrollMode(mode); } @Override diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 46cd45aa76637..82b7c4fb1393d 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -121,8 +121,8 @@ public class ListView extends AbsListView { Drawable mDivider; int mDividerHeight; - Drawable mOverscrollHeader; - Drawable mOverscrollFooter; + Drawable mOverScrollHeader; + Drawable mOverScrollFooter; private boolean mIsCacheColorOpaque; private boolean mDividerIsOpaque; @@ -178,12 +178,14 @@ public class ListView extends AbsListView { setDivider(d); } - final Drawable osHeader = a.getDrawable(com.android.internal.R.styleable.ListView_overscrollHeader); + final Drawable osHeader = a.getDrawable( + com.android.internal.R.styleable.ListView_overScrollHeader); if (osHeader != null) { setOverscrollHeader(osHeader); } - final Drawable osFooter = a.getDrawable(com.android.internal.R.styleable.ListView_overscrollFooter); + final Drawable osFooter = a.getDrawable( + com.android.internal.R.styleable.ListView_overScrollFooter); if (osFooter != null) { setOverscrollFooter(osFooter); } @@ -2997,8 +2999,8 @@ public class ListView extends AbsListView { protected void dispatchDraw(Canvas canvas) { // Draw the dividers final int dividerHeight = mDividerHeight; - final Drawable overscrollHeader = mOverscrollHeader; - final Drawable overscrollFooter = mOverscrollFooter; + final Drawable overscrollHeader = mOverScrollHeader; + final Drawable overscrollFooter = mOverScrollFooter; final boolean drawOverscrollHeader = overscrollHeader != null; final boolean drawOverscrollFooter = overscrollFooter != null; final boolean drawDividers = dividerHeight > 0 && mDivider != null; @@ -3243,7 +3245,7 @@ public class ListView extends AbsListView { * @param header The drawable to use */ public void setOverscrollHeader(Drawable header) { - mOverscrollHeader = header; + mOverScrollHeader = header; if (mScrollY < 0) { invalidate(); } @@ -3253,7 +3255,7 @@ public class ListView extends AbsListView { * @return The drawable that will be drawn above all other list content */ public Drawable getOverscrollHeader() { - return mOverscrollHeader; + return mOverScrollHeader; } /** @@ -3264,7 +3266,7 @@ public class ListView extends AbsListView { * @param footer The drawable to use */ public void setOverscrollFooter(Drawable footer) { - mOverscrollFooter = footer; + mOverScrollFooter = footer; invalidate(); } @@ -3272,7 +3274,7 @@ public class ListView extends AbsListView { * @return The drawable that will be drawn below all other list content */ public Drawable getOverscrollFooter() { - return mOverscrollFooter; + return mOverScrollFooter; } @Override diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java index 78973ad435de2..f48eb89e596c5 100644 --- a/core/java/android/widget/OverScroller.java +++ b/core/java/android/widget/OverScroller.java @@ -338,7 +338,7 @@ public class OverScroller { * @return true if a springback was initiated, false if startX and startY were * already within the valid range. */ - public boolean springback(int startX, int startY, int minX, int maxX, int minY, int maxY) { + public boolean springBack(int startX, int startY, int minX, int maxX, int minY, int maxY) { mMode = FLING_MODE; // Make sure both methods are called. @@ -433,7 +433,7 @@ public class OverScroller { * @return true when the current position is overscrolled and in the process of * interpolating back to a valid value. */ - public boolean isOverscrolled() { + public boolean isOverScrolled() { return ((!mScrollerX.mFinished && mScrollerX.mState != MagneticOverScroller.TO_EDGE) || (!mScrollerY.mFinished && diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 8472d9ce5e71c..0337b5c1f2226 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -463,7 +463,7 @@ public class ScrollView extends FrameLayout { /* Release the drag */ mIsBeingDragged = false; mActivePointerId = INVALID_POINTER; - if (mScroller.springback(mScrollX, mScrollY, 0, 0, 0, getScrollRange())) { + if (mScroller.springBack(mScrollX, mScrollY, 0, 0, 0, getScrollRange())) { invalidate(); } break; @@ -524,16 +524,16 @@ public class ScrollView extends FrameLayout { final int oldX = mScrollX; final int oldY = mScrollY; final int range = getScrollRange(); - if (overscrollBy(0, deltaY, 0, mScrollY, 0, range, + if (overScrollBy(0, deltaY, 0, mScrollY, 0, range, 0, mOverscrollDistance, true)) { // Break our velocity if we hit a scroll barrier. mVelocityTracker.clear(); } onScrollChanged(mScrollX, mScrollY, oldX, oldY); - final int overscrollMode = getOverscrollMode(); - if (overscrollMode == OVERSCROLL_ALWAYS || - (overscrollMode == OVERSCROLL_IF_CONTENT_SCROLLS && range > 0)) { + final int overscrollMode = getOverScrollMode(); + if (overscrollMode == OVER_SCROLL_ALWAYS || + (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) { final int pulledToY = oldY + deltaY; if (pulledToY < 0) { mEdgeGlowTop.onPull((float) deltaY / getHeight()); @@ -554,7 +554,7 @@ public class ScrollView extends FrameLayout { fling(-initialVelocity); } else { final int bottom = getScrollRange(); - if (mScroller.springback(mScrollX, mScrollY, 0, 0, 0, bottom)) { + if (mScroller.springBack(mScrollX, mScrollY, 0, 0, 0, bottom)) { invalidate(); } } @@ -575,7 +575,7 @@ public class ScrollView extends FrameLayout { break; case MotionEvent.ACTION_CANCEL: if (mIsBeingDragged && getChildCount() > 0) { - if (mScroller.springback(mScrollX, mScrollY, 0, 0, 0, getScrollRange())) { + if (mScroller.springBack(mScrollX, mScrollY, 0, 0, 0, getScrollRange())) { invalidate(); } mActivePointerId = INVALID_POINTER; @@ -615,14 +615,14 @@ public class ScrollView extends FrameLayout { } @Override - protected void onOverscrolled(int scrollX, int scrollY, + protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { // Treat animating scrolls differently; see #computeScroll() for why. if (!mScroller.isFinished()) { mScrollX = scrollX; mScrollY = scrollY; if (clampedY) { - mScroller.springback(mScrollX, mScrollY, 0, 0, 0, getScrollRange()); + mScroller.springBack(mScrollX, mScrollY, 0, 0, 0, getScrollRange()); } } else { super.scrollTo(scrollX, scrollY); @@ -1087,14 +1087,14 @@ public class ScrollView extends FrameLayout { int y = mScroller.getCurrY(); if (oldX != x || oldY != y) { - overscrollBy(x - oldX, y - oldY, oldX, oldY, 0, getScrollRange(), + overScrollBy(x - oldX, y - oldY, oldX, oldY, 0, getScrollRange(), 0, mOverflingDistance, false); onScrollChanged(mScrollX, mScrollY, oldX, oldY); final int range = getScrollRange(); - final int overscrollMode = getOverscrollMode(); - if (overscrollMode == OVERSCROLL_ALWAYS || - (overscrollMode == OVERSCROLL_IF_CONTENT_SCROLLS && range > 0)) { + final int overscrollMode = getOverScrollMode(); + if (overscrollMode == OVER_SCROLL_ALWAYS || + (overscrollMode == OVER_SCROLL_IF_CONTENT_SCROLLS && range > 0)) { if (y < 0 && oldY >= 0) { mEdgeGlowTop.onAbsorb((int) mScroller.getCurrVelocity()); } else if (y > range && oldY <= range) { @@ -1376,8 +1376,8 @@ public class ScrollView extends FrameLayout { } @Override - public void setOverscrollMode(int mode) { - if (mode != OVERSCROLL_NEVER) { + public void setOverScrollMode(int mode) { + if (mode != OVER_SCROLL_NEVER) { if (mEdgeGlowTop == null) { final Resources res = getContext().getResources(); final Drawable edge = res.getDrawable(R.drawable.overscroll_edge); @@ -1389,7 +1389,7 @@ public class ScrollView extends FrameLayout { mEdgeGlowTop = null; mEdgeGlowBottom = null; } - super.setOverscrollMode(mode); + super.setOverScrollMode(mode); } @Override diff --git a/core/res/res/layout/alert_dialog.xml b/core/res/res/layout/alert_dialog.xml index 25a41f867df93..d461f403181c7 100644 --- a/core/res/res/layout/alert_dialog.xml +++ b/core/res/res/layout/alert_dialog.xml @@ -81,7 +81,7 @@ android:paddingBottom="12dip" android:paddingLeft="14dip" android:paddingRight="10dip" - android:overscrollMode="ifContentScrolls"> + android:overScrollMode="ifContentScrolls"> + android:overScrollMode="ifContentScrolls"> + android:overScrollMode="ifContentScrolls" /> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 6f0ce71e973d0..6370696708a2b 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1351,16 +1351,17 @@ (typically, your Activity). --> - - - + + + - - + @@ -1797,9 +1798,9 @@ The default value is true. --> - + - + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 10cb44667742f..cc91fb7863cb7 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1251,9 +1251,9 @@ - - - + + + diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index c3f42056178f3..c744e4bcc13d5 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fadingEdge="none" - android:overscrollMode="ifContentScrolls" + android:overScrollMode="ifContentScrolls" >