diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-09-18 15:19:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-18 15:19:40 +0000 |
| commit | ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a (patch) | |
| tree | 3729a6b1352765104788ab318a88152eed339749 | |
| parent | c0b89b72af01c6e7bf805f29fa6cc531d6388b6f (diff) | |
| parent | 493f6bc142916da3fe50ae4884b941a4f18c100c (diff) | |
| download | android_packages_apps_Trebuchet-ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a.tar.gz android_packages_apps_Trebuchet-ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a.tar.bz2 android_packages_apps_Trebuchet-ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a.zip | |
Merge "Perform null check in animation complete" into ub-now-porkchop
| -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 bd39ea86c..b31e6fc77 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(); |