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

Merge "Fix edge effect not showing up on first scroll" am: 894d8cf470 am: 391a7c381d

Browse Source 
am: bc7b84e463

Change-Id: I2ac88eeed21db2767fbc2a01070d1905a2a74697
This commit is contained in:
Vu Thanh Cong
2018-07-25 10:48:29 -07:00
committed by android-build-merger
parent 9afc75d604 bc7b84e463
commit 7d3edea9eb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4337,13 +4337,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
translateX = 0; translateX = 0;
translateY = 0; translateY = 0;
} }
mEdgeGlowTop.setSize(width, height);
mEdgeGlowBottom.setSize(width, height);
if (!mEdgeGlowTop.isFinished()) { if (!mEdgeGlowTop.isFinished()) {
final int restoreCount = canvas.save(); final int restoreCount = canvas.save();
canvas.clipRect(translateX, translateY, canvas.clipRect(translateX, translateY,
translateX + width ,translateY + mEdgeGlowTop.getMaxHeight()); translateX + width ,translateY + mEdgeGlowTop.getMaxHeight());
final int edgeY = Math.min(0, scrollY + mFirstPositionDistanceGuess) + translateY; final int edgeY = Math.min(0, scrollY + mFirstPositionDistanceGuess) + translateY;
canvas.translate(translateX, edgeY); canvas.translate(translateX, edgeY);
mEdgeGlowTop.setSize(width, height);
if (mEdgeGlowTop.draw(canvas)) { if (mEdgeGlowTop.draw(canvas)) {
invalidateTopGlow(); invalidateTopGlow();
} }
@@ -4358,7 +4359,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
- (clipToPadding ? mPaddingBottom : 0); - (clipToPadding ? mPaddingBottom : 0);
canvas.translate(edgeX, edgeY); canvas.translate(edgeX, edgeY);
canvas.rotate(180, width, 0); canvas.rotate(180, width, 0);
mEdgeGlowBottom.setSize(width, height);
if (mEdgeGlowBottom.draw(canvas)) { if (mEdgeGlowBottom.draw(canvas)) {
invalidateBottomGlow(); invalidateBottomGlow();
} }