From 564dc9249535651f70139e7592009bea37a9b7ab Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Mon, 22 Nov 2010 12:12:48 +0000 Subject: overscroll: Don't overshoot unless the item is an explicit scrollable list In other words... No scrollbars, no overscroll for you. Change-Id: I28bcd11151c323091d6447643341a7330dc913db --- core/java/android/view/View.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 919ac6c..49284d4 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -8844,9 +8844,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility * @return This view's overscroll mode. */ public int getOverscrollMode() { - if (Settings.System.getInt(mContext.getContentResolver(), - Settings.System.ALLOW_OVERSCROLL, 0) <= 0) - return OVERSCROLL_NEVER; + /* 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; } -- cgit v1.1