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

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

Browse Source 
Merge commit '36a182870527f1d71f482e9a280bc818a4609cb6' into gingerbread-plus-aosp

* commit '36a182870527f1d71f482e9a280bc818a4609cb6':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
This commit is contained in:
Mindy Pereira
2010-10-07 15:47:44 -07:00
committed by Android Git Automerger
parent d185494da6 36a1828705
commit 4f2c8cc86a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/widget/AbsListView.java
View File

@@ -2247,8 +2247,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
mTouchMode = TOUCH_MODE_OVERSCROLL; mTouchMode = TOUCH_MODE_OVERSCROLL;
if (rawDeltaY > 0) { if (rawDeltaY > 0) {
mEdgeGlowTop.onPull((float) overscroll / getHeight()); mEdgeGlowTop.onPull((float) overscroll / getHeight());
if (!mEdgeGlowBottom.isFinished()) {
mEdgeGlowBottom.onRelease();
}
} else if (rawDeltaY < 0) { } else if (rawDeltaY < 0) {
mEdgeGlowBottom.onPull((float) overscroll / getHeight()); mEdgeGlowBottom.onPull((float) overscroll / getHeight());
if (!mEdgeGlowTop.isFinished()) {
mEdgeGlowTop.onRelease();
}
} }
} }
} }
@@ -2307,8 +2313,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
!contentFits())) { !contentFits())) {
if (rawDeltaY > 0) { if (rawDeltaY > 0) {
mEdgeGlowTop.onPull((float) -incrementalDeltaY / getHeight()); mEdgeGlowTop.onPull((float) -incrementalDeltaY / getHeight());
if (!mEdgeGlowBottom.isFinished()) {
mEdgeGlowBottom.onRelease();
}
} else if (rawDeltaY < 0) { } else if (rawDeltaY < 0) {
mEdgeGlowBottom.onPull((float) -incrementalDeltaY / getHeight()); mEdgeGlowBottom.onPull((float) -incrementalDeltaY / getHeight());
if (!mEdgeGlowTop.isFinished()) {
mEdgeGlowTop.onRelease();
}
} }
invalidate(); invalidate();
} }