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

Commit 6c4609ad authored Oct 07, 2010 by Mindy Pereira Committed by Android Git Automerger Oct 07, 2010

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

Merge commit 'dfe0870e' into gingerbread-plus-aosp

* commit 'dfe0870e':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.

parents 4b7ff734 dfe0870e

core/java/android/widget/HorizontalScrollView.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -542,8 +542,14 @@ public class HorizontalScrollView extends FrameLayout {
		final int pulledToX = oldX + deltaX;
		if (pulledToX < 0) {
		mEdgeGlowLeft.onPull((float) deltaX / getWidth());
		if (!mEdgeGlowRight.isFinished()) {
		mEdgeGlowRight.onRelease();
		}
		} else if (pulledToX > range) {
		mEdgeGlowRight.onPull((float) deltaX / getWidth());
		if (!mEdgeGlowLeft.isFinished()) {
		mEdgeGlowLeft.onRelease();
		}
		}
		}
		}

core/java/android/widget/ScrollView.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -537,8 +537,14 @@ public class ScrollView extends FrameLayout {
		final int pulledToY = oldY + deltaY;
		if (pulledToY < 0) {
		mEdgeGlowTop.onPull((float) deltaY / getHeight());
		if (!mEdgeGlowBottom.isFinished()) {
		mEdgeGlowBottom.onRelease();
		}
		} else if (pulledToY > range) {
		mEdgeGlowBottom.onPull((float) deltaY / getHeight());
		if (!mEdgeGlowTop.isFinished()) {
		mEdgeGlowTop.onRelease();
		}
		}
		}
		}