commit c452bfe2b8d5a3ff9486eddbefba8a0ef8688229
author Tony Wickham <twickham@google.com> Wed Aug 03 19:37:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 03 19:37:40 2016 +0000
tree e83ab3f30162b3c62288e02e56ded5de0a9d0308
parent 9084b375bf4862d10674abfa138e15e73372d52c
parent 1f01b016ce29b498cfece4edf6418cd5050091aa

Align shortcut text with view start.
am: 1f01b016ce

Change-Id: I48fdfbabe3313b98d26adf0fe3a654060088b970

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();
             }
         });