Initial changes to merged AllApps/Customize pane in the Phone UI.

Change-Id: Ifa1676736033fe617dd0cca965156c38fa452948
2011-04-14 16:08:02 -07:00
parent f579b5041a
commit 785d2eb2b8
53 changed files with 1308 additions and 362 deletions
@@ -162,10 +162,13 @@ public class ApplicationInfoDropTarget extends IconDropTarget {
        // Fade in the overlapping views
        if (mOverlappingViews != null) {
            for (View view : mOverlappingViews) {
-                ObjectAnimator oa = ObjectAnimator.ofFloat(view, "alpha", 1.0f);
-                oa.setDuration(sFadeInAnimationDuration);
-                mFadeAnimator.play(oa);
-                view.setVisibility(VISIBLE);
+                // Check whether the views are enabled first, before trying to fade them in
+                if (view.isEnabled()) {
+                    ObjectAnimator oa = ObjectAnimator.ofFloat(view, "alpha", 1.0f);
+                    oa.setDuration(sFadeInAnimationDuration);
+                    mFadeAnimator.play(oa);
+                    view.setVisibility(VISIBLE);
+                }
            }
        }
        mFadeAnimator.start();