summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/AppsCustomizeTabHost.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-11-15 17:04:31 -0800
committerMichael Jurka <mikejurka@google.com>2011-11-15 17:04:47 -0800
commit3d845e8d8921eebe0b072b7856b660b4350921e1 (patch)
tree5ea4845c5fb3e8b1cb48b18b13d1eac0456886b5 /src/com/android/launcher2/AppsCustomizeTabHost.java
parent4c4c001a85d8e1533c8df38a0c0d27bb959ebc70 (diff)
downloadandroid_packages_apps_Trebuchet-3d845e8d8921eebe0b072b7856b660b4350921e1.tar.gz
android_packages_apps_Trebuchet-3d845e8d8921eebe0b072b7856b660b4350921e1.tar.bz2
android_packages_apps_Trebuchet-3d845e8d8921eebe0b072b7856b660b4350921e1.zip
Fix bug where all apps didn't load sometimes
Bug #5623281
Diffstat (limited to 'src/com/android/launcher2/AppsCustomizeTabHost.java')
-rw-r--r--src/com/android/launcher2/AppsCustomizeTabHost.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index 334b3691a..7321a796d 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()) {