Merge cherrypicks of [14389731, 14389751, 14389771] into sc-release
Change-Id: I6a18052f7b39faa3773ee9f6b0ba7725bc415bc9
This commit is contained in:
@@ -388,8 +388,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
|
||||
}
|
||||
|
||||
protected void pageEndTransition() {
|
||||
if (mIsPageInTransition && !mIsBeingDragged && mScroller.isFinished()
|
||||
&& mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()) {
|
||||
if (mIsPageInTransition) {
|
||||
mIsPageInTransition = false;
|
||||
onPageEndTransition();
|
||||
}
|
||||
@@ -1741,7 +1740,6 @@ 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) {
|
||||
|
||||
Reference in New Issue
Block a user