commit ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a
author Adam Cohen <adamcohen@google.com> Thu Sep 18 15:19:39 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 18 15:19:40 2014 +0000
tree 3729a6b1352765104788ab318a88152eed339749
parent c0b89b72af01c6e7bf805f29fa6cc531d6388b6f
parent 493f6bc142916da3fe50ae4884b941a4f18c100c

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

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();