summaryrefslogtreecommitdiff
path: root/core/java/com/android
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2012-06-21 16:46:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-21 16:46:58 -0700
commitef46aa157be555349ae3762db7953a3ae48087f8 (patch)
tree5ec22dd111cfbaac9791666793adf21a42d714d1 /core/java/com/android
parent60abfa5c3aae69c48ab38d11bdcb0f6452deadc0 (diff)
parent70a7be0799bd1af77c0bcf2472d9c7e46f53c3c1 (diff)
am 70a7be07: am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height.
* commit '70a7be0799bd1af77c0bcf2472d9c7e46f53c3c1': revert I057b7ac0 now that the layouts are the expected height.
Diffstat (limited to 'core/java/com/android')
-rw-r--r--core/java/com/android/internal/widget/SizeAdaptiveLayout.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java
index 7687ad171917..273f6fef321e 100644
--- a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java
+++ b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java
@@ -53,6 +53,7 @@ public class SizeAdaptiveLayout extends ViewGroup {
private static final String TAG = "SizeAdaptiveLayout";
private static final boolean DEBUG = false;
+ private static final boolean REPORT_BAD_BOUNDS = true;
private static final long CROSSFADE_TIME = 250;
// TypedArray indices
@@ -175,7 +176,7 @@ public class SizeAdaptiveLayout extends ViewGroup {
height = Math.min(height, lp.maxHeight);
}
- if (DEBUG && heightIn != height) {
+ if (REPORT_BAD_BOUNDS && heightIn != height) {
Log.d(TAG, this + "child view " + child + " " +
"measured out of bounds at " + heightIn +"px " +
"clamped to " + height + "px");