commit ed5cc0e1f7648962f5c93e1277d282be75bcd537
author Chris Wren <cwren@android.com> Thu Jun 21 11:25:58 2012 -0400
committer Chris Wren <cwren@android.com> Thu Jun 21 13:07:29 2012 -0400
tree d70bd0916b4b3882feef7d2004894fb861899537
parent d5353b475001f19e3cbc9c1a4165c9e6038a812f

revert I057b7ac0 now that the layouts are the expected height.

Bug: 6546766
Change-Id: I736290b897b864228ecc3e46d86ef566efda1efd

core/java/com/android/internal/widget/SizeAdaptiveLayout.java

diff --git a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java
index 7687ad1..273f6fe 100644
--- a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java
+++ b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java
@@ -53,6 +53,7 @@
 
     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 @@
             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");

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 750c6dc..a3ec6c3 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 @@
         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);
         }