commit 0d89e1d764216baf4e57f1dee7bbf7b3c462be97
author Adam Cohen <adamcohen@google.com> Thu Sep 18 15:27:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 18 15:27:49 2014 +0000
tree 3729a6b1352765104788ab318a88152eed339749
parent e4bafbb3ce33f6d0017de3c00d967bba48737464
parent ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a

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

* commit 'ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a':
  Perform null check in animation complete

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index bd39ea8..b31e6fc 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3632,9 +3632,11 @@
                     }
 
                     // 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();