diff options
| author | Adam Powell <adamp@google.com> | 2014-07-19 13:05:26 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2014-07-19 13:05:26 -0700 |
| commit | c80f95228560e5912e97886ed637f4d538e87c70 (patch) | |
| tree | 10e93a5cc1f7bc0824f815f87b8fdd98b1be354e /core/java | |
| parent | fba286a056985f3e44f4ea587782a67ef60920bd (diff) | |
| download | frameworks_base-c80f95228560e5912e97886ed637f4d538e87c70.zip frameworks_base-c80f95228560e5912e97886ed637f4d538e87c70.tar.gz frameworks_base-c80f95228560e5912e97886ed637f4d538e87c70.tar.bz2 | |
Fix Toolbar title layout in RTL mode
Welp, that one was embarrassing.
Bug 16192193
Change-Id: I4e94e71ef34b4b08b5dd4c7b7f0dfb22e834ca19
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/Toolbar.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java index c0d8764..d403bf5 100644 --- a/core/java/android/widget/Toolbar.java +++ b/core/java/android/widget/Toolbar.java @@ -1344,7 +1344,7 @@ public class Toolbar extends ViewGroup { subtitleRight = subtitleRight - mTitleMarginEnd; titleTop = subtitleBottom + lp.bottomMargin; } - right = Math.max(titleRight, subtitleRight); + right = Math.min(titleRight, subtitleRight); } else { final int ld = mTitleMarginStart - collapsingMargins[0]; left += Math.max(0, ld); |