summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
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);
+ }
}
}