drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 09329186: am b3b2922b: Merge "Fix bug #7649607 Hebrew text is cut off in Settings" into jb-mr1.1-dev

Browse Source 
* commit '09329186eaf66b6c03d0ff5cc8df910800649b7d':
  Fix bug #7649607 Hebrew text is cut off in Settings
This commit is contained in:
Fabrice Di Meglio
2012-12-06 18:59:32 -08:00
committed by Android Git Automerger
parent 5b09fcc716 09329186ea
commit 7ee2f7785f
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/widget/RelativeLayout.java
View File

@ -419,7 +419,7 @@ public class RelativeLayout extends ViewGroup {
// We need to know our size for doing the correct computation of positioning in RTL mode // We need to know our size for doing the correct computation of positioning in RTL mode
if (isLayoutRtl() && (myWidth == -1 || isWrapContentWidth)) { if (isLayoutRtl() && (myWidth == -1 || isWrapContentWidth)) {
myWidth = getPaddingStart() + getPaddingEnd(); int w = getPaddingStart() + getPaddingEnd();
final int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); final int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
View child = views[i]; View child = views[i];
@ -436,8 +436,18 @@ public class RelativeLayout extends ViewGroup {
} }
child.measure(childWidthMeasureSpec, childHeightMeasureSpec); child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
myWidth += child.getMeasuredWidth(); w += child.getMeasuredWidth();
myWidth += params.leftMargin + params.rightMargin; w += params.leftMargin + params.rightMargin;
}
}
if (myWidth == -1) {
// Easy case: "myWidth" was undefined before so use the width we have just computed
myWidth = w;
} else {
// "myWidth" was defined before, so take the min of it and the computed width if it
// is a non null one
if (w > 0) {
myWidth = Math.min(myWidth, w);
} }
} }
} }