From 493f6bc142916da3fe50ae4884b941a4f18c100c Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 18 Sep 2014 08:11:05 -0700
Subject: Perform null check in animation complete

Bug 17561235

Change-Id: I280dca9e03eed3f4e1edd97f2f8efac0b5e4b29d
---
 src/com/android/launcher3/Launcher.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/com/android/launcher3')

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1b95c2b3f..2094b0768 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -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();
-- 
cgit v1.2.3