From 57e489c8b5652e073a43619f5b6fb588c88b9395 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Mon, 4 Mar 2019 14:57:07 -0800 Subject: 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 --- .../WorkspaceStateTransitionAnimation.java | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/com/android/launcher3/WorkspaceStateTransitionAnimation.java') diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 1c595ab54..0507470e5 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -72,6 +72,7 @@ public class WorkspaceStateTransitionAnimation { private void setWorkspaceProperty(LauncherState state, PropertySetter propertySetter, AnimatorSetBuilder builder, AnimationConfig config) { float[] scaleAndTranslation = state.getWorkspaceScaleAndTranslation(mLauncher); + float[] hotseatScaleAndTranslation = state.getHotseatScaleAndTranslation(mLauncher); mNewScale = scaleAndTranslation[0]; PageAlphaProvider pageAlphaProvider = state.getWorkspacePageAlphaProvider(mLauncher); final int childCount = mWorkspace.getChildCount(); @@ -89,16 +90,16 @@ public class WorkspaceStateTransitionAnimation { Interpolator scaleInterpolator = builder.getInterpolator(ANIM_WORKSPACE_SCALE, ZOOM_OUT); propertySetter.setFloat(mWorkspace, SCALE_PROPERTY, mNewScale, scaleInterpolator); - if (state.scaleHotseatWithWorkspace()) { - DragLayer dragLayer = mLauncher.getDragLayer(); - int[] workspacePivot = new int[]{(int) mWorkspace.getPivotX(), - (int) mWorkspace.getPivotY()}; - dragLayer.getDescendantCoordRelativeToSelf(mWorkspace, workspacePivot); - dragLayer.mapCoordInSelfToDescendant(hotseat, workspacePivot); - hotseat.setPivotX(workspacePivot[0]); - hotseat.setPivotY(workspacePivot[1]); - propertySetter.setFloat(hotseat, SCALE_PROPERTY, mNewScale, scaleInterpolator); - } + // Set the hotseat's pivot point to match the workspace's, so that it scales together. + DragLayer dragLayer = mLauncher.getDragLayer(); + int[] workspacePivot = new int[]{(int) mWorkspace.getPivotX(), + (int) mWorkspace.getPivotY()}; + dragLayer.getDescendantCoordRelativeToSelf(mWorkspace, workspacePivot); + dragLayer.mapCoordInSelfToDescendant(hotseat, workspacePivot); + hotseat.setPivotX(workspacePivot[0]); + hotseat.setPivotY(workspacePivot[1]); + float hotseatScale = hotseatScaleAndTranslation[0]; + propertySetter.setFloat(hotseat, SCALE_PROPERTY, hotseatScale, scaleInterpolator); float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0; propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, fadeInterpolator); @@ -116,12 +117,11 @@ public class WorkspaceStateTransitionAnimation { scaleAndTranslation[1], translationInterpolator); propertySetter.setFloat(mWorkspace, View.TRANSLATION_Y, scaleAndTranslation[2], translationInterpolator); - if (state.scaleHotseatWithWorkspace()) { - propertySetter.setFloat(hotseat, View.TRANSLATION_Y, - scaleAndTranslation[2], translationInterpolator); - propertySetter.setFloat(mWorkspace.getPageIndicator(), View.TRANSLATION_Y, - scaleAndTranslation[2], translationInterpolator); - } + + propertySetter.setFloat(hotseat, View.TRANSLATION_Y, + hotseatScaleAndTranslation[2], translationInterpolator); + propertySetter.setFloat(mWorkspace.getPageIndicator(), View.TRANSLATION_Y, + hotseatScaleAndTranslation[2], translationInterpolator); // Set scrim WorkspaceAndHotseatScrim scrim = mLauncher.getDragLayer().getScrim(); -- cgit v1.2.3