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

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

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

* commit 'dfe0870e72574eaffc9a165f01a021149529d9c2':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
This commit is contained in:
Mindy Pereira
2010-10-07 16:04:35 -07:00
committed by Android Git Automerger
parent 4b7ff73461 dfe0870e72
commit 6c4609ada4
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/widget/HorizontalScrollView.java
View File

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

6
core/java/android/widget/ScrollView.java
View File

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