diff options
author | Michael Jurka <mikejurka@google.com> | 2011-11-16 12:57:39 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-16 12:57:39 -0800 |
commit | c97ddb679c7b2eaec78f136d840ad7975d03002f (patch) | |
tree | c74a6507aa9e674c4d855f88000ebd41c2bdbf81 /src/com/android/launcher2/AppsCustomizeTabHost.java | |
parent | 345ed924bac099236226c95eee925a91f6b75095 (diff) | |
parent | 3d845e8d8921eebe0b072b7856b660b4350921e1 (diff) | |
download | android_packages_apps_Trebuchet-c97ddb679c7b2eaec78f136d840ad7975d03002f.tar.gz android_packages_apps_Trebuchet-c97ddb679c7b2eaec78f136d840ad7975d03002f.tar.bz2 android_packages_apps_Trebuchet-c97ddb679c7b2eaec78f136d840ad7975d03002f.zip |
Merge "Fix bug where all apps didn't load sometimes" into ics-mr1
Diffstat (limited to 'src/com/android/launcher2/AppsCustomizeTabHost.java')
-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()) { |