diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-19 18:46:43 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-19 18:46:43 -0700 |
| commit | d3156a2a5656e154b517b5fd3498fc46c045fcd3 (patch) | |
| tree | 780bb7a395ec1e41b50687d1cf971c79e2b642b9 /core/java/android/view | |
| parent | 398a6713c355cf59af071e944268aec7c0096b5a (diff) | |
| download | frameworks_base-d3156a2a5656e154b517b5fd3498fc46c045fcd3.zip frameworks_base-d3156a2a5656e154b517b5fd3498fc46c045fcd3.tar.gz frameworks_base-d3156a2a5656e154b517b5fd3498fc46c045fcd3.tar.bz2 | |
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
This was a regression introduced by a previous CL.
- we actually need to let the layout params resolution goes all the time
as we dont have any "isResolved" state and a public API for doing its reset thru ViewGroup.
The current implementation is simple and works even if it is doing sometimes a bit more
than it should really do. This is a well conscious tradeoff.
Change-Id: I5c4d532331b3970dfe88f016bc305cbc4a0d83f1
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index dabdf5a..c252c77 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -5990,11 +5990,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager */ @Override public void resolveLayoutDirection(int layoutDirection) { - // No need to resolve if it is the same layout direction as before - if (this.layoutDirection == layoutDirection) { - return; - } - setLayoutDirection(layoutDirection); if (!isMarginRelative()) return; |