diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-09-18 15:27:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-18 15:27:49 +0000 |
| commit | 0d89e1d764216baf4e57f1dee7bbf7b3c462be97 (patch) | |
| tree | 3729a6b1352765104788ab318a88152eed339749 | |
| parent | e4bafbb3ce33f6d0017de3c00d967bba48737464 (diff) | |
| parent | ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a (diff) | |
| download | android_packages_apps_Trebuchet-0d89e1d764216baf4e57f1dee7bbf7b3c462be97.tar.gz android_packages_apps_Trebuchet-0d89e1d764216baf4e57f1dee7bbf7b3c462be97.tar.bz2 android_packages_apps_Trebuchet-0d89e1d764216baf4e57f1dee7bbf7b3c462be97.zip | |
am ddd5aaaf: Merge "Perform null check in animation complete" into ub-now-porkchop
* commit 'ddd5aaaf354beb5add6bcc2560c4f975d49a9f6a':
Perform null check in animation complete
| -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(); |