diff options
| author | Tony Wickham <twickham@google.com> | 2019-03-04 14:57:07 -0800 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2019-03-04 14:57:07 -0800 |
| commit | 57e489c8b5652e073a43619f5b6fb588c88b9395 (patch) | |
| tree | c54cd8bf6349686eb90404d6f6b51c678f79f0e9 /src/com/android/launcher3/states/SpringLoadedState.java | |
| parent | c920b5986d17b74cd6c8d9cc27cd49dc347f9600 (diff) | |
| download | android_packages_apps_Trebuchet-57e489c8b5652e073a43619f5b6fb588c88b9395.tar.gz android_packages_apps_Trebuchet-57e489c8b5652e073a43619f5b6fb588c88b9395.tar.bz2 android_packages_apps_Trebuchet-57e489c8b5652e073a43619f5b6fb588c88b9395.zip | |
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
Diffstat (limited to 'src/com/android/launcher3/states/SpringLoadedState.java')
| -rw-r--r-- | src/com/android/launcher3/states/SpringLoadedState.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java index d49dfbb8f..fcace98c2 100644 --- a/src/com/android/launcher3/states/SpringLoadedState.java +++ b/src/com/android/launcher3/states/SpringLoadedState.java @@ -73,8 +73,8 @@ public class SpringLoadedState extends LauncherState { } @Override - public boolean scaleHotseatWithWorkspace() { - return false; + public float[] getHotseatScaleAndTranslation(Launcher launcher) { + return new float[] {1, 0, 0}; } @Override |