Merge "Calling pageTransisionEnd only after edgeEffect finishes" into sc-dev am: 44e6fb6ed4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14355769

Change-Id: Ic84e7b4f4a5116de88b094b8149cbb26b8c0df6e
This commit is contained in:
TreeHugger Robot
2021-04-29 22:36:46 +00:00
committed by Automerger Merge Worker

View File

@@ -388,7 +388,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
}
protected void pageEndTransition() {
if (mIsPageInTransition) {
if (mIsPageInTransition && !mIsBeingDragged && mScroller.isFinished()
&& mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()) {
mIsPageInTransition = false;
onPageEndTransition();
}
@@ -1740,6 +1741,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
public void draw(Canvas canvas) {
super.draw(canvas);
drawEdgeEffect(canvas);
pageEndTransition();
}
protected void drawEdgeEffect(Canvas canvas) {