Merge "Fix bug where all apps didn't load sometimes" into ics-mr1

This commit is contained in:
Michael Jurka
2011-11-16 12:57:39 -08:00
committed by Android (Google) Code Review

View File

@@ -355,19 +355,19 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
public boolean onLauncherTransitionStart(Launcher l, Animator animation, boolean toWorkspace) {
mInTransition = true;
boolean delayLauncherTransitionUntilLayout = false;
boolean animated = (animation != null);
mLauncherTransition = null;
// if the content wasn't visible before, delay the launcher animation until after a cal
// if the content wasn't visible before, delay the launcher animation until after a call
// to layout -- this prevents a blip
if (animation != null) {
if (mContent.getVisibility() == GONE) {
mLauncherTransition = animation;
delayLauncherTransitionUntilLayout = true;
}
mContent.setVisibility(VISIBLE);
if (!delayLauncherTransitionUntilLayout) {
enableAndBuildHardwareLayer();
}
if (animated && mContent.getVisibility() == GONE) {
mLauncherTransition = animation;
delayLauncherTransitionUntilLayout = true;
}
mContent.setVisibility(VISIBLE);
if (animated && !delayLauncherTransitionUntilLayout) {
enableAndBuildHardwareLayer();
}
if (!toWorkspace && !LauncherApplication.isScreenLarge()) {