Merge "Fix animation of settings button in RTL layout case" am: cc3525748e

am: f4017acb4a Change-Id: I8c43bf3742f2de724e9f0441396b9b5cd1255e90
2017-09-01 13:20:42 +00:00
parent 1c1d81493e f4017acb4a
commit e30e3430f9
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
@@ -170,7 +170,8 @@ public class QSFooter extends FrameLayout implements
        int defSpace = mContext.getResources().getDimensionPixelOffset(R.dimen.default_gear_space);

        mAnimator = new Builder()
-                .addFloat(mSettingsContainer, "translationX", -(remaining - defSpace), 0)
+                .addFloat(mSettingsContainer, "translationX",
+                        isLayoutRtl() ? (remaining - defSpace) : -(remaining - defSpace), 0)
                .addFloat(mSettingsButton, "rotation", -120, 0)
                .build();
        if (mAlarmShowing) {