summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2012-05-25 06:21:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-25 06:21:56 -0700
commit04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758 (patch)
treeaa855f86339c8fcd991c08f6cf91c69452159b56 /core/java/com
parentc7f82cc7fd2b747284da692f73ea7f09b0db9099 (diff)
parent5462508f05286d873183b72106928c17f259ff67 (diff)
downloadframeworks_base-04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758.zip
frameworks_base-04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758.tar.gz
frameworks_base-04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758.tar.bz2
Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/widget/SizeAdaptiveLayout.java2
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");