Merge "Perform null check in animation complete" into ub-now-porkchop

This commit is contained in:
Adam Cohen 2014-09-18 15:19:39 +00:00 committed by Android (Google) Code Review
commit ddd5aaaf35
1 changed files with 5 additions and 3 deletions

View File

@ -3632,9 +3632,11 @@ public class Launcher extends Activity
}
// Reset page transforms
page.setTranslationX(0);
page.setTranslationY(0);
page.setAlpha(1);
if (page != null) {
page.setTranslationX(0);
page.setTranslationY(0);
page.setAlpha(1);
}
content.setCurrentPage(content.getNextPage());
mAppsCustomizeContent.updateCurrentPageScroll();