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

Commit 612390dc authored by Chris Banes's avatar Chris Banes Committed by Android (Google) Code Review
Browse files

Merge "Make Toolbar ignore its minHeight if larger than height"

parents 1797abd4 8053117a

core/java/android/widget/Toolbar.java

+2 −1
Original line number Diff line number Diff line
@@ -1689,7 +1689,8 @@ public class Toolbar extends ViewGroup { 
        collapsingMargins[0] = collapsingMargins[1] = 0;



        // Align views within the minimum toolbar height, if set.

        final int alignmentHeight = getMinimumHeight();

        final int minHeight = getMinimumHeight();

        final int alignmentHeight = minHeight >= 0 ? Math.min(minHeight, b - t) : 0;



        if (shouldLayout(mNavButtonView)) {

            if (isRtl) {