Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 31db0307: am 71ff46d2: am 0505a3fe: Fix Toolbar title layout in RTL mode

Browse Source 
* commit '31db0307c95e7b1bbbd6eca37eca20b12247e23f':
  Fix Toolbar title layout in RTL mode
This commit is contained in:
Adam Powell
2014-07-21 18:25:16 +00:00
committed by Android Git Automerger
parent 898484e5ff 79412ffe60
commit 088746bf55
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/Toolbar.java
View File

@@ -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);