Merge "overscroll: Don't overshoot unless the item is an explicit scrollable list" into froyo (ba839620) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -8844,9 +8844,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		* @return This view's overscroll mode.
		*/
		public int getOverscrollMode() {
		/* User explicit disable */
		if (Settings.System.getInt(mContext.getContentResolver(),
		Settings.System.ALLOW_OVERSCROLL, 0) <= 0)
		return OVERSCROLL_NEVER;
		/* Don't overscroll items without scrollbars */
		else if ((mViewFlags & SCROLLBARS_VERTICAL) == 0 && (mViewFlags & SCROLLBARS_HORIZONTAL) == 0)
		return OVERSCROLL_NEVER;

		return mOverscrollMode;
		}