diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-12-21 12:40:38 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-12-22 11:21:18 -0800 |
| commit | 9328a51271dbcf122021dcf5e40a6cc41a0cb90f (patch) | |
| tree | ed1f06b8309c465293bf2aaaa1d7c8332a4bf4f8 /src | |
| parent | 8c8fdec3e967286106c369db18e8bb69e5da4542 (diff) | |
| download | android_packages_apps_Trebuchet-9328a51271dbcf122021dcf5e40a6cc41a0cb90f.tar.gz android_packages_apps_Trebuchet-9328a51271dbcf122021dcf5e40a6cc41a0cb90f.tar.bz2 android_packages_apps_Trebuchet-9328a51271dbcf122021dcf5e40a6cc41a0cb90f.zip | |
Adding translationX to workspace card to that it is slightly visible
behind the first card
Change-Id: Idc0c169fb92510e74b983160778bd9dbacf29943
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherState.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/WorkspaceStateTransitionAnimation.java | 10 | ||||
| -rw-r--r-- | src/com/android/launcher3/states/SpringLoadedState.java | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index 2beaca102..a1f58791b 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -137,7 +137,7 @@ public class LauncherState { } public float[] getWorkspaceScaleAndTranslation(Launcher launcher) { - return new float[] {1, 0}; + return new float[] {1, 0, 0}; } public float getHoseatAlpha(Launcher launcher) { diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 80818f2bb..9ed86eda4 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -123,10 +123,8 @@ public class WorkspaceStateTransitionAnimation { * Starts a transition animation for the workspace. */ private void setWorkspaceProperty(LauncherState state, PropertySetter propertySetter) { - float[] scaleAndTranslationY = state.getWorkspaceScaleAndTranslation(mLauncher); - mNewScale = scaleAndTranslationY[0]; - final float finalWorkspaceTranslationY = scaleAndTranslationY[1]; - + float[] scaleAndTranslation = state.getWorkspaceScaleAndTranslation(mLauncher); + mNewScale = scaleAndTranslation[0]; PageAlphaProvider pageAlphaProvider = state.getWorkspacePageAlphaProvider(mLauncher); final int childCount = mWorkspace.getChildCount(); for (int i = 0; i < childCount; i++) { @@ -135,8 +133,10 @@ public class WorkspaceStateTransitionAnimation { } propertySetter.setFloat(mWorkspace, SCALE_PROPERTY, mNewScale, Interpolators.ZOOM_IN); + propertySetter.setFloat(mWorkspace, View.TRANSLATION_X, + scaleAndTranslation[1], Interpolators.ZOOM_IN); propertySetter.setFloat(mWorkspace, View.TRANSLATION_Y, - finalWorkspaceTranslationY, Interpolators.ZOOM_IN); + scaleAndTranslation[2], Interpolators.ZOOM_IN); float hotseatAlpha = state.getHoseatAlpha(mLauncher); propertySetter.setViewAlpha(mWorkspace.createHotseatAlphaAnimator(hotseatAlpha), diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java index 995cdaa33..da656db13 100644 --- a/src/com/android/launcher3/states/SpringLoadedState.java +++ b/src/com/android/launcher3/states/SpringLoadedState.java @@ -70,7 +70,7 @@ public class SpringLoadedState extends LauncherState { float myCenter = ws.getTop() + halfHeight; float cellTopFromCenter = halfHeight - ws.getChildAt(0).getTop(); float actualCellTop = myCenter - cellTopFromCenter * scale; - return new float[] { scale, (desiredCellTop - actualCellTop) / scale}; + return new float[] { scale, 0, (desiredCellTop - actualCellTop) / scale}; } @Override |