commit 493f6bc142916da3fe50ae4884b941a4f18c100c
author Adam Cohen <adamcohen@google.com> Thu Sep 18 08:11:05 2014 -0700
committer Adam Cohen <adamcohen@google.com> Thu Sep 18 08:14:05 2014 -0700
tree 1cc4e8207e372884ca63514a765fa9b9247661d7
parent 83e5941d8ef6ca33bdd6278f6089c8d6d00de942

Perform null check in animation complete

Bug 17561235

Change-Id: I280dca9e03eed3f4e1edd97f2f8efac0b5e4b29d

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1b95c2b..2094b07 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();