diff options
| author | Chris Wren <cwren@android.com> | 2012-05-25 06:24:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-25 06:24:12 -0700 |
| commit | af948894195d2af09295210d4266bb45c4f4ba9e (patch) | |
| tree | 2f0804cb850a77fcf438294c48d9d4a1bdbb84f3 /core/java/com | |
| parent | 98b9221a903796aab9615526105a51b4386a078c (diff) | |
| parent | 04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758 (diff) | |
| download | frameworks_base-af948894195d2af09295210d4266bb45c4f4ba9e.zip frameworks_base-af948894195d2af09295210d4266bb45c4f4ba9e.tar.gz frameworks_base-af948894195d2af09295210d4266bb45c4f4ba9e.tar.bz2 | |
am 04b63f6f: Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
* commit '04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758':
Squelch the logs from SizeAdaptiveLayout.
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/SizeAdaptiveLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java index bbf5509..7687ad1 100644 --- a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java +++ b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java @@ -175,7 +175,7 @@ public class SizeAdaptiveLayout extends ViewGroup { height = Math.min(height, lp.maxHeight); } - if (heightIn != height) { + if (DEBUG && heightIn != height) { Log.d(TAG, this + "child view " + child + " " + "measured out of bounds at " + heightIn +"px " + "clamped to " + height + "px"); |