diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-11-22 14:35:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2010-11-22 14:35:50 +0000 |
| commit | ba839620cfdaf9233b20f00a0a05c4259a31ce3b (patch) | |
| tree | b3a84f7ab9da0edb4196ae27d9a07a6acdb68b8f /core/java | |
| parent | 130753e574411b5b70e2fc3f6c05e1e027762ad2 (diff) | |
| parent | 564dc9249535651f70139e7592009bea37a9b7ab (diff) | |
| download | frameworks_base-ba839620cfdaf9233b20f00a0a05c4259a31ce3b.zip frameworks_base-ba839620cfdaf9233b20f00a0a05c4259a31ce3b.tar.gz frameworks_base-ba839620cfdaf9233b20f00a0a05c4259a31ce3b.tar.bz2 | |
Merge "overscroll: Don't overshoot unless the item is an explicit scrollable list" into froyo
Diffstat (limited to 'core/java')
| -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; } |