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

This commit is contained in:
Adam Powell
2010-09-13 16:09:51 -07:00
committed by Android (Google) Code Review

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);
} }
/** /**