summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-02-23 16:39:12 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-23 16:39:12 -0800
commitb89ba237b94d67b21ae66fdfc786e874c5f11bc5 (patch)
tree47fae17c6a65b429c4082d463471ecfc65b96904 /src
parent88f334571fe41df620ba903ced9b2c69b0170d5c (diff)
parenta8352d22afd3b78ab01ded90ad1674599100fda5 (diff)
downloadandroid_packages_apps_Trebuchet-b89ba237b94d67b21ae66fdfc786e874c5f11bc5.tar.gz
android_packages_apps_Trebuchet-b89ba237b94d67b21ae66fdfc786e874c5f11bc5.tar.bz2
android_packages_apps_Trebuchet-b89ba237b94d67b21ae66fdfc786e874c5f11bc5.zip
Merge "Cancel scroll indicator fade during allapps/workspace transition"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/AppsCustomizeTabHost.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index 4639c57cc..152b21588 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher2/AppsCustomizeTabHost.java
@@ -370,6 +370,9 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
if (toWorkspace) {
// Going from All Apps -> Workspace
setVisibilityOfSiblingsWithLowerZOrder(VISIBLE);
+ // Stop the scrolling indicator - we don't want All Apps to be invalidating itself
+ // during the transition, especially since it has a hardware layer set on it
+ mAppsCustomizePane.cancelScrollingIndicatorAnimations();
} else {
// Going from Workspace -> All Apps
mContent.setVisibility(VISIBLE);