am cb037eee: Fixing overscroll not drawn in rtl
* commit 'cb037eee8ca863ad99d9cdbacd6a82759295e5a0':
Fixing overscroll not drawn in rtl
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 54450f0..c9bbe0a 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -885,11 +885,6 @@
}
}
- if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < childCount) {
- updateCurrentPageScroll();
- mFirstLayout = false;
- }
-
final LayoutTransition transition = getLayoutTransition();
// If the transition is running defer updating max scroll, as some empty pages could
// still be present, and a max scroll change could cause sudden jumps in scroll.
@@ -914,6 +909,11 @@
updateMaxScrollX();
}
+ if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < childCount) {
+ updateCurrentPageScroll();
+ mFirstLayout = false;
+ }
+
if (mScroller.isFinished() && mChildCountOnLastLayout != childCount) {
if (mRestorePage != INVALID_RESTORE_PAGE) {
setCurrentPage(mRestorePage);
@@ -1147,7 +1147,7 @@
if (!mEdgeGlowRight.isFinished()) {
final int restoreCount = canvas.save();
Rect display = mViewport;
- canvas.translate(display.left + mPageScrolls[getChildCount() - 1], display.top);
+ canvas.translate(display.left + mPageScrolls[mIsRtl ? 0 : (getPageCount() - 1)], display.top);
canvas.rotate(90);
getEdgeVerticalPostion(sTmpIntPoint);