commit 8e8c46069c3f014694b59bbeb49105e085c5e59c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 27 22:21:41 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 27 22:21:41 2019 +0000
tree e7de40886d94138419e2343400243c1b6b84ef28
parent 38b2748eb2254adf902966c6b267ed55ca3cdf6b
parent 2ed8936da143de7f99d9bbf212df37ee3361c1ca

Merge "Fix translationX that should be translationY" into ub-launcher3-master

src/com/android/launcher3/WorkspaceStateTransitionAnimation.java

diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
index d0f1920..bed61a1 100644
--- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
+++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java
@@ -121,7 +121,7 @@
                 scaleAndTranslation.translationY, translationInterpolator);
 
         propertySetter.setFloat(hotseat, View.TRANSLATION_Y,
-                hotseatScaleAndTranslation.translationX, translationInterpolator);
+                hotseatScaleAndTranslation.translationY, translationInterpolator);
         propertySetter.setFloat(mWorkspace.getPageIndicator(), View.TRANSLATION_Y,
                 hotseatScaleAndTranslation.translationY, translationInterpolator);