Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread

Browse Source 
Merge commit 'b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp

* commit 'b07c078921fb917d33075a63d77fdf98221e2bac':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
This commit is contained in:
Adam Powell
2010-09-13 16:11:55 -07:00
committed by Android Git Automerger
parent b62bc96322 b07c078921
commit 59a29f4a6c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/View.java
View File

@@ -1582,7 +1582,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
* {@link #OVERSCROLL_ALWAYS}, {@link #OVERSCROLL_IF_CONTENT_SCROLLS}, * {@link #OVERSCROLL_ALWAYS}, {@link #OVERSCROLL_IF_CONTENT_SCROLLS},
* and {@link #OVERSCROLL_NEVER}. * and {@link #OVERSCROLL_NEVER}.
*/ */
private int mOverscrollMode = OVERSCROLL_ALWAYS; private int mOverscrollMode;
/** /**
* The parent this view is attached to. * The parent this view is attached to.
@@ -1876,6 +1876,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
// Used for debug only // Used for debug only
//++sInstanceCount; //++sInstanceCount;
mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop(); mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
setOverscrollMode(OVERSCROLL_ALWAYS);
} }
/** /**