diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-09-18 08:11:05 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2014-09-18 08:14:05 -0700 |
| commit | 493f6bc142916da3fe50ae4884b941a4f18c100c (patch) | |
| tree | 1cc4e8207e372884ca63514a765fa9b9247661d7 | |
| parent | 83e5941d8ef6ca33bdd6278f6089c8d6d00de942 (diff) | |
| download | android_packages_apps_Trebuchet-493f6bc142916da3fe50ae4884b941a4f18c100c.tar.gz android_packages_apps_Trebuchet-493f6bc142916da3fe50ae4884b941a4f18c100c.tar.bz2 android_packages_apps_Trebuchet-493f6bc142916da3fe50ae4884b941a4f18c100c.zip | |
Perform null check in animation complete
Bug 17561235
Change-Id: I280dca9e03eed3f4e1edd97f2f8efac0b5e4b29d
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 |
1 files changed, 5 insertions, 3 deletions
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(); |