summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2017-09-01 12:56:56 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-09-01 12:56:56 +0000
commitcc3525748e4b1317afb1c396587207867e95f842 (patch)
treefd860294365c9573ab6039e492b059caf716d7db
parentc6b2e356b6e4c3ec5e17e5521d55d7bc6c2785f3 (diff)
parent5cb7cd1300ff8b20f9afce9b5e3ac73c76b96571 (diff)
Merge "Fix animation of settings button in RTL layout case"
-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 2473335e6e15..cef7c8ac9a8c 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) {