Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fa1e32f authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Align taskbar children to Y value instead of X." into tm-qpr-dev

parents 2790c9db d3cffe81

quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java

+2 −2
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
                        MULTI_PROPERTY_VALUE, isStashed

                                ? new float[] {croppedTransX}

                                : new float[] {croppedTransX, 0}));

                as.play(ObjectAnimator.ofFloat(mtd.getTranslationX(INDEX_TASKBAR_REVEAL_ANIM),

                as.play(ObjectAnimator.ofFloat(mtd.getTranslationY(INDEX_TASKBAR_REVEAL_ANIM),

                        MULTI_PROPERTY_VALUE, isStashed

                                ? new float[] {croppedTransY}

                                : new float[] {croppedTransY, 0}));
@@ -503,7 +503,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 


                setter.setFloat(mtd.getTranslationX(INDEX_TASKBAR_ALIGNMENT_ANIM),

                        MULTI_PROPERTY_VALUE, hotseatIconCenter - childCenter, interpolator);

                setter.setFloat(mtd.getTranslationX(INDEX_TASKBAR_ALIGNMENT_ANIM),

                setter.setFloat(mtd.getTranslationY(INDEX_TASKBAR_ALIGNMENT_ANIM),

                        MULTI_PROPERTY_VALUE, mTaskbarBottomMargin, interpolator);

            } else {

                setter.setFloat(child, VIEW_TRANSLATE_X,