diff options
| -rw-r--r-- | core/java/com/android/internal/widget/SizeAdaptiveLayout.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 6 |
2 files changed, 5 insertions, 4 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"); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 750c6dc0ba1b..a3ec6c33da13 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -561,14 +561,14 @@ public abstract class BaseStatusBar extends SystemUI implements if (expandedOneU != null) { SizeAdaptiveLayout.LayoutParams params = new SizeAdaptiveLayout.LayoutParams(expandedOneU.getLayoutParams()); - params.minHeight = rowHeight; - params.maxHeight = rowHeight; + params.minHeight = minHeight; + params.maxHeight = minHeight; adaptive.addView(expandedOneU, params); } if (expandedLarge != null) { SizeAdaptiveLayout.LayoutParams params = new SizeAdaptiveLayout.LayoutParams(expandedLarge.getLayoutParams()); - params.minHeight = rowHeight+1; + params.minHeight = minHeight+1; params.maxHeight = maxHeight; adaptive.addView(expandedLarge, params); } |