Fix blip in AllApps transition
Change-Id: I599867712796b5ec0e0523f3dbcf11b50e012d93
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 01efd4f..71c3af6 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1137,8 +1137,11 @@
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);
+ }
}
}