commit 7b6e3aea315dd9a73890234d00df1afe277b2c68
author Tony Wickham <twickham@google.com> Wed Aug 03 19:27:53 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 03 19:27:53 2016 +0000
tree e83ab3f30162b3c62288e02e56ded5de0a9d0308
parent 9407db1e11f2f465c46590dd12926669eac1ca0c
parent 1f01b016ce29b498cfece4edf6418cd5050091aa

Merge "Align shortcut text with view start." into ub-launcher3-calgary

src/com/android/launcher3/allapps/AllAppsTransitionController.java

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index a8c0422..e46b889 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -418,6 +418,9 @@
         mAppsView.post(new Runnable() {
             @Override
             public void run() {
+                if (mDiscoBounceAnimation == null) {
+                    return;
+                }
                 mDiscoBounceAnimation.start();
             }
         });