Skip to content

Commit acb1c12

Browse files
author
Fabrice Di Meglio
committed
Fix bug #7266459 android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO
- do not ask for requestLayout() nor invalidate() in View.onMeasure() when resolving RTL properties Change-Id: I7961fcb4c046d96391a4e748350573534481ae2b
1 parent 217ca3b commit acb1c12

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

core/java/android/view/View.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5871,6 +5871,8 @@ public void setLayoutDirection(int layoutDirection) {
58715871
((layoutDirection << PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT) & PFLAG2_LAYOUT_DIRECTION_MASK);
58725872
// We need to resolve all RTL properties as they all depend on layout direction
58735873
resolveRtlPropertiesIfNeeded();
5874+
requestLayout();
5875+
invalidate(true);
58745876
}
58755877
}
58765878

@@ -11568,8 +11570,6 @@ void resolveRtlPropertiesIfNeeded() {
1156811570
if (!isDrawablesResolved()) {
1156911571
resolveDrawables();
1157011572
}
11571-
requestLayout();
11572-
invalidate(true);
1157311573
onRtlPropertiesChanged(getLayoutDirection());
1157411574
}
1157511575

0 commit comments

Comments
 (0)