diff options
| author | Konstantin Lopyrev <klopyrev@google.com> | 2010-08-18 11:43:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-18 11:43:21 -0700 |
| commit | f2af87b39b294a197b9a7aaa611a14cfcd669a16 (patch) | |
| tree | 8356917a6aebef164ffb708c1d5c9811354ac032 /core | |
| parent | c4554b9a0885ac3713575e91d8d33c5670b52322 (diff) | |
| parent | bef337f516eafaee8f3891e22688b74388570317 (diff) | |
| download | frameworks_base-f2af87b39b294a197b9a7aaa611a14cfcd669a16.zip frameworks_base-f2af87b39b294a197b9a7aaa611a14cfcd669a16.tar.gz frameworks_base-f2af87b39b294a197b9a7aaa611a14cfcd669a16.tar.bz2 | |
Merge "Making sure the draw time is measured." into gingerbread
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewDebug.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 2ca08ea..402443c 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -990,7 +990,8 @@ public class ViewDebug { } }) : 0; long durationDraw = - (root || (view.mPrivateFlags & View.DRAWN) != 0) ? profileViewOperation(view, + (root || !view.willNotDraw() || (view.mPrivateFlags & View.DRAWN) != 0) ? profileViewOperation( + view, new ViewOperation<Object>() { public Object[] pre() { final DisplayMetrics metrics = |