Fix hotseat translated upwards when dragging from all apps
Before, we just didn't scale or translate when entering spring loaded
state. That worked when dragging from home, but when dragging from all
apps it meant that the hotseat kept its translation from the transition
to all apps. Now we always move the hotseat to scale 1 and translation 0
when going to spring loaded mode.
Change-Id: I0630d5bb899e37e2ab01516adfc1b7e6f8a9e42a
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index b49578b..cee1c26 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -187,11 +187,9 @@
return new float[] {1, 0, 0};
}
- /**
- * @return Whether we should scale the hotseat as if it were part of the workspace.
- */
- public boolean scaleHotseatWithWorkspace() {
- return true;
+ public float[] getHotseatScaleAndTranslation(Launcher launcher) {
+ // For most states, treat the hotseat as if it were part of the workspace.
+ return getWorkspaceScaleAndTranslation(launcher);
}
/**