PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7fc1887e: am 1ef2123c: Fixing NPE in updateCurrentPageScroll (Bug 7465970)

Browse Source 
* commit '7fc1887ede6695b4293891e4b2c29b3be3cc15f8':
  Fixing NPE in updateCurrentPageScroll (Bug 7465970)
This commit is contained in:
Winson Chung
2012-11-27 11:36:00 -08:00
committed by Android Git Automerger
parent 148a2e7092 7fc1887ede
commit 1aed82c28f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/PagedView.java
+7 -3
View File
@@ -297,9 +297,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
* the previous tab page. * the previous tab page.
*/ */
protected void updateCurrentPageScroll() { protected void updateCurrentPageScroll() {
int offset = getChildOffset(mCurrentPage); // If the current page is invalid, just reset the scroll position to zero
int relOffset = getRelativeChildOffset(mCurrentPage); int newX = 0;
int newX = offset - relOffset; if (0 <= mCurrentPage && mCurrentPage < getPageCount()) {
int offset = getChildOffset(mCurrentPage);
int relOffset = getRelativeChildOffset(mCurrentPage);
newX = offset - relOffset;
}
scrollTo(newX, 0); scrollTo(newX, 0);
mScroller.setFinalX(newX); mScroller.setFinalX(newX);
mScroller.forceFinished(true); mScroller.forceFinished(true);