diff options
| author | Adam Powell <adamp@google.com> | 2014-07-01 17:38:18 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2014-07-01 17:42:34 -0700 |
| commit | b3e411458cd7b96bb308e2de3086efc4da10d64d (patch) | |
| tree | bbc71646d107e98eecb416557749b9f81f448151 /core/java/android/widget/Toolbar.java | |
| parent | ade3f25a488fc3c1243db8c88554771e571beeb1 (diff) | |
Fix a copy/paste bug in Toolbar.
Bug 15868762
Change-Id: Ie2a0c492f9d7baa05d520cd2fee652245ab4b61b
Diffstat (limited to 'core/java/android/widget/Toolbar.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 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) { |