revert I057b7ac0 now that the layouts are the expected height.

Bug: 6546766
Change-Id: I736290b897b864228ecc3e46d86ef566efda1efd

Author: cwren

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 @@ private int clampSizeToBounds(int measuredHeight, View child) {
             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

@@ -561,14 +561,14 @@ protected  boolean inflateViews(NotificationData.Entry entry, ViewGroup parent)
         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);
         }