summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-09-12 15:28:15 -0700
committerAdam Cohen <adamcohen@google.com>2011-09-12 15:28:15 -0700
commit7842d7fc78eebfb2b7cbad23adf11f7b6d923f79 (patch)
treeedb580e931eef281033899bf1ca6b2a5b1835c15 /src
parentf4ddea3df72fad2e0fb022cc7212d87d8cb69143 (diff)
downloadandroid_packages_apps_Trebuchet-7842d7fc78eebfb2b7cbad23adf11f7b6d923f79.tar.gz
android_packages_apps_Trebuchet-7842d7fc78eebfb2b7cbad23adf11f7b6d923f79.tar.bz2
android_packages_apps_Trebuchet-7842d7fc78eebfb2b7cbad23adf11f7b6d923f79.zip
Fix blip in AllApps transition
Change-Id: I599867712796b5ec0e0523f3dbcf11b50e012d93
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Workspace.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 01efd4fb3..71c3af65a 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1137,8 +1137,11 @@ public class Workspace extends SmoothPagedView
cl.setTranslationX(translationX);
cl.setRotationY(rotation);
} else {
- resetCellLayoutTransforms((CellLayout) getChildAt(0), true);
- resetCellLayoutTransforms((CellLayout) getChildAt(getChildCount() - 1), false);
+ // We don't want to mess with the translations during transitions
+ if (!isSwitchingState()) {
+ resetCellLayoutTransforms((CellLayout) getChildAt(0), true);
+ resetCellLayoutTransforms((CellLayout) getChildAt(getChildCount() - 1), false);
+ }
}
}