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

* commit 'ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a': Perform null check in animation complete
2014-09-18 15:27:49 +00:00
parent e4bafbb3ce ddd5aaaf35
commit 0d89e1d764
1 changed files with 5 additions and 3 deletions
@@ -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();