summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2018-07-25 16:43:11 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-07-25 16:43:11 +0000
commit894d8cf470c74aed139da89a4bd9c33dd146b83c (patch)
tree9101456f1b202f585024b728009240fa9bdc9d39
parent8c8fb65ad322fbdb7f3580797a2caa7147f979c2 (diff)
parent3af8c96b26c2c870eb523eec98619a1898092bb3 (diff)
Merge "Fix edge effect not showing up on first scroll"
-rw-r--r--core/java/android/widget/AbsListView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 6c7455d35397..256b5c96c636 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -4328,13 +4328,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
translateX = 0;
translateY = 0;
}
+ mEdgeGlowTop.setSize(width, height);
+ mEdgeGlowBottom.setSize(width, height);
if (!mEdgeGlowTop.isFinished()) {
final int restoreCount = canvas.save();
canvas.clipRect(translateX, translateY,
translateX + width ,translateY + mEdgeGlowTop.getMaxHeight());
final int edgeY = Math.min(0, scrollY + mFirstPositionDistanceGuess) + translateY;
canvas.translate(translateX, edgeY);
- mEdgeGlowTop.setSize(width, height);
if (mEdgeGlowTop.draw(canvas)) {
invalidateTopGlow();
}
@@ -4349,7 +4350,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
- (clipToPadding ? mPaddingBottom : 0);
canvas.translate(edgeX, edgeY);
canvas.rotate(180, width, 0);
- mEdgeGlowBottom.setSize(width, height);
if (mEdgeGlowBottom.draw(canvas)) {
invalidateBottomGlow();
}