Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59a29f4a authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect... 

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

Merge commit 'b07c0789' into gingerbread-plus-aosp

* commit 'b07c0789':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
parents b62bc963 b07c0789

core/java/android/view/View.java

+2 −1
Original line number Diff line number Diff line
@@ -1582,7 +1582,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
     * {@link #OVERSCROLL_ALWAYS}, {@link #OVERSCROLL_IF_CONTENT_SCROLLS},

     * and {@link #OVERSCROLL_NEVER}.

     */

    private int mOverscrollMode = OVERSCROLL_ALWAYS;

    private int mOverscrollMode;



    /**

     * The parent this view is attached to.
@@ -1876,6 +1876,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
        // Used for debug only

        //++sInstanceCount;

        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();

        setOverscrollMode(OVERSCROLL_ALWAYS);

    }



    /**