Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3e41145 authored by Adam Powell's avatar Adam Powell
Browse files

Fix a copy/paste bug in Toolbar. 

Bug 15868762

Change-Id: Ie2a0c492f9d7baa05d520cd2fee652245ab4b61b
parent ade3f25a

core/java/android/widget/Toolbar.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {