Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't add title margins during to Toolbar layout if titles don't fit

Browse Source 
When all space is consumed in a Toolbar by other views the special
shared title/subtitle margins shouldn't be added to the running
position during layout.

Bug 17253638

Change-Id: I179fcbf286fa68fd8df6e25bb1879bccbf1532ed
This commit is contained in:
Adam Powell
2014-08-28 19:21:18 -07:00
parent 7c13bc2a70
commit 4c9765a654
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/widget/Toolbar.java
View File

@@ -1326,6 +1326,8 @@ public class Toolbar extends ViewGroup {
final View bottomChild = layoutSubtitle ? mSubtitleTextView : mTitleTextView;
final LayoutParams toplp = (LayoutParams) topChild.getLayoutParams();
final LayoutParams bottomlp = (LayoutParams) bottomChild.getLayoutParams();
final boolean titleHasWidth = layoutTitle && mTitleTextView.getMeasuredWidth() > 0
|| layoutSubtitle && mSubtitleTextView.getMeasuredWidth() > 0;
switch (mGravity & Gravity.VERTICAL_GRAVITY_MASK) {
case Gravity.TOP:
@@ -1353,7 +1355,7 @@ public class Toolbar extends ViewGroup {
break;
}
if (isRtl) {
final int rd = mTitleMarginStart - collapsingMargins[1];
final int rd = (titleHasWidth ? mTitleMarginStart : 0) - collapsingMargins[1];
right -= Math.max(0, rd);
collapsingMargins[1] = Math.max(0, -rd);
int titleRight = right;
@@ -1376,9 +1378,11 @@ public class Toolbar extends ViewGroup {
subtitleRight = subtitleRight - mTitleMarginEnd;
titleTop = subtitleBottom + lp.bottomMargin;
}
right = Math.min(titleRight, subtitleRight);
if (titleHasWidth) {
right = Math.min(titleRight, subtitleRight);
}
} else {
final int ld = mTitleMarginStart - collapsingMargins[0];
final int ld = (titleHasWidth ? mTitleMarginStart : 0) - collapsingMargins[0];
left += Math.max(0, ld);
collapsingMargins[0] = Math.max(0, -ld);
int titleLeft = left;
@@ -1401,7 +1405,9 @@ public class Toolbar extends ViewGroup {
subtitleLeft = subtitleRight + mTitleMarginEnd;
titleTop = subtitleBottom + lp.bottomMargin;
}
left = Math.max(titleLeft, subtitleLeft);
if (titleHasWidth) {
left = Math.max(titleLeft, subtitleLeft);
}
}
}