summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/AppsCustomizeTabHost.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-02-14 12:13:34 -0800
committerWinson Chung <winsonc@google.com>2012-02-14 13:36:59 -0800
commit9753d13c7bda09c1203c611ac6717021037f39c3 (patch)
tree1a948661436dab156c55110c4e781f8e0c626ba3 /src/com/android/launcher2/AppsCustomizeTabHost.java
parentd83f5f4db328fbd152491bbf9fa13abc94bd6f25 (diff)
downloadandroid_packages_apps_Trebuchet-9753d13c7bda09c1203c611ac6717021037f39c3.tar.gz
android_packages_apps_Trebuchet-9753d13c7bda09c1203c611ac6717021037f39c3.tar.bz2
android_packages_apps_Trebuchet-9753d13c7bda09c1203c611ac6717021037f39c3.zip
Revert "Speed up All Apps -> Workspace transition"
Temp fix for 5976264 This reverts commit 9433fa7ebad74320e39bfac6161a68bc850fe161. Change-Id: Ic49ffc818b9b233b3717b52a5f77eaac1e001f5b
Diffstat (limited to 'src/com/android/launcher2/AppsCustomizeTabHost.java')
-rw-r--r--src/com/android/launcher2/AppsCustomizeTabHost.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index caababa8e..023946b26 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher2/AppsCustomizeTabHost.java
@@ -347,8 +347,9 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
/* LauncherTransitionable overrides */
@Override
- public void onLauncherTransitionStart(Launcher l, boolean animated, boolean toWorkspace) {
+ public void onLauncherTransitionStart(Launcher l, Animator animation, boolean toWorkspace) {
mInTransition = true;
+ boolean animated = (animation != null);
mContent.setVisibility(VISIBLE);
@@ -371,9 +372,9 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
}
@Override
- public void onLauncherTransitionEnd(Launcher l, boolean animated, boolean toWorkspace) {
+ public void onLauncherTransitionEnd(Launcher l, Animator animation, boolean toWorkspace) {
mInTransition = false;
- if (animated) {
+ if (animation != null) {
setLayerType(LAYER_TYPE_NONE, null);
}