commit a38dc90188a6bee465b72e8383b36b264e30a08a
author Adam Cohen <adamcohen@google.com> Sun Sep 07 17:48:55 2014 +0200
committer Adam Cohen <adamcohen@google.com> Sun Sep 07 18:43:54 2014 +0200
tree 6e056c4dc9093a2832309d1b7c8fbe291e89d893
parent cd1452859d0a0d68a70388a3ae82d69d97041eb5

Ensure all apps button inintialized before performing all apps transition

-> Also removing text shadows in all apps and folders (bug 16955157)

Bug 17400227

Change-Id: I67d361a7a1cb548c9caca4214621607feaef963a

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 924ed11..e7c658a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3230,7 +3230,10 @@
             mAppsCustomizeTabHost.setContentTypeImmediate(contentType);
         }
 
-        if (animated) {
+        // If for some reason our views aren't initialized, don't animate
+        boolean initialized = getAllAppsButton() != null;
+
+        if (animated && initialized) {
             mStateAnimation = LauncherAnimUtils.createAnimatorSet();
             final AppsCustomizePagedView content = (AppsCustomizePagedView)
                     toView.findViewById(R.id.apps_customize_pane_content);
@@ -3457,7 +3460,10 @@
                     toState, animated, layerViews);
         }
 
-        if (animated) {
+        // If for some reason our views aren't initialized, don't animate
+        boolean initialized = getAllAppsButton() != null;
+
+        if (animated && initialized) {
             mStateAnimation = LauncherAnimUtils.createAnimatorSet();
             if (workspaceAnim != null) {
                 mStateAnimation.play(workspaceAnim);