diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2010-11-22 12:12:48 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2010-11-22 13:56:17 +0000 |
| commit | 564dc9249535651f70139e7592009bea37a9b7ab (patch) | |
| tree | 6dccc68faa6855ec902ad3378a04ec503e672f16 | |
| parent | f8629697d5cf42a8115aef9621d7e150cb2e449d (diff) | |
| download | frameworks_base-564dc9249535651f70139e7592009bea37a9b7ab.zip frameworks_base-564dc9249535651f70139e7592009bea37a9b7ab.tar.gz frameworks_base-564dc9249535651f70139e7592009bea37a9b7ab.tar.bz2 | |
overscroll: Don't overshoot unless the item is an explicit scrollable list
In other words... No scrollbars, no overscroll for you.
Change-Id: I28bcd11151c323091d6447643341a7330dc913db
| -rw-r--r-- | core/java/android/view/View.java | 10 |
1 files 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; } |