summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/Toolbar.java2
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);