From acb1c124aca178b6231bf3029745e20fffdf2020 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Tue, 2 Oct 2012 14:18:55 -0700 Subject: 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 --- core/java/android/view/View.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/java') diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 3ed47ea..2d083b6 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5871,6 +5871,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, ((layoutDirection << PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT) & PFLAG2_LAYOUT_DIRECTION_MASK); // We need to resolve all RTL properties as they all depend on layout direction resolveRtlPropertiesIfNeeded(); + requestLayout(); + invalidate(true); } } @@ -11568,8 +11570,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (!isDrawablesResolved()) { resolveDrawables(); } - requestLayout(); - invalidate(true); onRtlPropertiesChanged(getLayoutDirection()); } -- cgit v1.1