diff options
| author | Chet Haase <chet@google.com> | 2013-07-26 00:27:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-26 00:27:50 +0000 |
| commit | b63425e4e7269e5b3f40a895542528cc3905d2a1 (patch) | |
| tree | f20dc5ffefbd4018cd605e0f0783001f025280aa /core/java/android | |
| parent | 09d20f3bc24fb74d164ef8a0ef820840067d048c (diff) | |
| parent | deababcd53056bbe5cd586454e9cf50e03ab1b0f (diff) | |
| download | frameworks_base-b63425e4e7269e5b3f40a895542528cc3905d2a1.zip frameworks_base-b63425e4e7269e5b3f40a895542528cc3905d2a1.tar.gz frameworks_base-b63425e4e7269e5b3f40a895542528cc3905d2a1.tar.bz2 | |
Merge "Fix lazy measure logic to not use obsolete values"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/View.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 555e883..299c4a2 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -15995,7 +15995,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, resolveRtlPropertiesIfNeeded(); - int cacheIndex = mMeasureCache.indexOfKey(key); + int cacheIndex = (mPrivateFlags & PFLAG_FORCE_LAYOUT) == PFLAG_FORCE_LAYOUT ? -1 : + mMeasureCache.indexOfKey(key); if (cacheIndex < 0) { // measure ourselves, this should set the measured dimension flag back onMeasure(widthMeasureSpec, heightMeasureSpec); |