From 7842d7fc78eebfb2b7cbad23adf11f7b6d923f79 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Mon, 12 Sep 2011 15:28:15 -0700 Subject: [PATCH] Fix blip in AllApps transition Change-Id: I599867712796b5ec0e0523f3dbcf11b50e012d93 --- src/com/android/launcher2/Workspace.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 01efd4fb3c..71c3af65ac 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); + } } }