diff options
author | Michael Jurka <mikejurka@google.com> | 2011-11-15 17:04:31 -0800 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2011-11-16 16:29:26 -0800 |
commit | 60988ea9a13c732060042c744496bff4329eb45b (patch) | |
tree | 7725d47ff5ecc3cf2fbde383e6311a99f67f6cd6 | |
parent | 1a695a7e7025357dd625005d6d4d1f46b194ffa1 (diff) | |
download | android_packages_apps_Trebuchet-60988ea9a13c732060042c744496bff4329eb45b.tar.gz android_packages_apps_Trebuchet-60988ea9a13c732060042c744496bff4329eb45b.tar.bz2 android_packages_apps_Trebuchet-60988ea9a13c732060042c744496bff4329eb45b.zip |
Fix bug where all apps didn't load sometimes
Bug #5623281
-rw-r--r-- | src/com/android/launcher2/AppsCustomizeTabHost.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java index 07e662525..897a7fb51 100644 --- a/src/com/android/launcher2/AppsCustomizeTabHost.java +++ b/src/com/android/launcher2/AppsCustomizeTabHost.java @@ -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()) { |