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

Commit 4f2c8cc8 authored by Mindy Pereira's avatar Mindy Pereira Committed by Android Git Automerger
Browse files

am 36a18287: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread

Merge commit '36a18287' into gingerbread-plus-aosp

* commit '36a18287':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
parents d185494d 36a18287
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -2247,8 +2247,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                                mTouchMode = TOUCH_MODE_OVERSCROLL;
                                if (rawDeltaY > 0) {
                                    mEdgeGlowTop.onPull((float) overscroll / getHeight());
                                    if (!mEdgeGlowBottom.isFinished()) {
                                        mEdgeGlowBottom.onRelease();
                                    }
                                } else if (rawDeltaY < 0) {
                                    mEdgeGlowBottom.onPull((float) overscroll / getHeight());
                                    if (!mEdgeGlowTop.isFinished()) {
                                        mEdgeGlowTop.onRelease();
                                    }
                                }
                            }
                        }
@@ -2307,8 +2313,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                                        !contentFits())) {
                            if (rawDeltaY > 0) {
                                mEdgeGlowTop.onPull((float) -incrementalDeltaY / getHeight());
                                if (!mEdgeGlowBottom.isFinished()) {
                                    mEdgeGlowBottom.onRelease();
                                }
                            } else if (rawDeltaY < 0) {
                                mEdgeGlowBottom.onPull((float) -incrementalDeltaY / getHeight());
                                if (!mEdgeGlowTop.isFinished()) {
                                    mEdgeGlowTop.onRelease();
                                }
                            }
                            invalidate();
                        }