diff options
| author | Tony Wickham <twickham@google.com> | 2015-09-11 09:27:58 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2015-09-15 11:37:58 -0700 |
| commit | 34d2c915c4762a073b60bb676a9e905392e9679c (patch) | |
| tree | db5e660fbec645b2f8bc0cad4d6543e134d57f0c /src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | |
| parent | b54c4a3d864110a222e12683d88e6d46c27bf7a1 (diff) | |
| download | android_packages_apps_Trebuchet-34d2c915c4762a073b60bb676a9e905392e9679c.tar.gz android_packages_apps_Trebuchet-34d2c915c4762a073b60bb676a9e905392e9679c.tar.bz2 android_packages_apps_Trebuchet-34d2c915c4762a073b60bb676a9e905392e9679c.zip | |
Added AppInfoDropTargetBar to spring loaded workspace.
Change-Id: Ieedc68eba9a5934ab30d6d546d8a837274491064
Diffstat (limited to 'src/com/android/launcher3/WorkspaceStateTransitionAnimation.java')
| -rw-r--r-- | src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 011f4a2b1..d32ce7377 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -285,8 +285,13 @@ public class WorkspaceStateTransitionAnimation { float finalHotseatAndPageIndicatorAlpha = (states.stateIsNormal || states.stateIsSpringLoaded) ? 1f : 0f; float finalOverviewPanelAlpha = states.stateIsOverview ? 1f : 0f; - float finalWorkspaceTranslationY = states.stateIsOverview || states.stateIsOverviewHidden ? - mWorkspace.getOverviewModeTranslationY() : 0; + + float finalWorkspaceTranslationY = 0; + if (states.stateIsOverview || states.stateIsOverviewHidden) { + finalWorkspaceTranslationY = mWorkspace.getOverviewModeTranslationY(); + } else if (states.stateIsSpringLoaded) { + finalWorkspaceTranslationY = mWorkspace.getSpringLoadedTranslationY(); + } final int childCount = mWorkspace.getChildCount(); final int customPageCount = mWorkspace.numCustomPages(); |