summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2017-09-01 13:20:42 +0000
committer android-build-merger <android-build-merger@google.com> 2017-09-01 13:20:42 +0000
commite30e3430f9365493acf6cef8418c5bd3d16dfbdd (patch)
treef249232ee9683566ca3d05300984184f0535ca61
parent1c1d81493e6222b62b3b858f80fdd1cc3f020c71 (diff)
parentf4017acb4a940f95d23b4823cce8200057ab5f89 (diff)
Merge "Fix animation of settings button in RTL layout case" am: cc3525748e
am: f4017acb4a Change-Id: I8c43bf3742f2de724e9f0441396b9b5cd1255e90
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/QSFooter.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
index 4e75c60b8e1e..f47ef1ef4a87 100644
--- 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) {