From b3e411458cd7b96bb308e2de3086efc4da10d64d Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Tue, 1 Jul 2014 17:38:18 -0700 Subject: Fix a copy/paste bug in Toolbar. Bug 15868762 Change-Id: Ie2a0c492f9d7baa05d520cd2fee652245ab4b61b --- core/java/android/widget/Toolbar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/java/android/widget') diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java index d140c82b3865..24950f6d7039 100644 --- a/core/java/android/widget/Toolbar.java +++ b/core/java/android/widget/Toolbar.java @@ -1233,7 +1233,7 @@ public class Toolbar extends ViewGroup { } if (layoutSubtitle) { final LayoutParams lp = (LayoutParams) mSubtitleTextView.getLayoutParams(); - titleHeight += lp.bottomMargin + mTitleTextView.getMeasuredHeight() + lp.bottomMargin; + titleHeight += lp.topMargin + mSubtitleTextView.getMeasuredHeight() + lp.bottomMargin; } if (layoutTitle || layoutSubtitle) { -- cgit v1.2.3