Merge "Fix 1U notifications." into jb-dev

Author: dsandler

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

@@ -539,14 +539,14 @@ protected  boolean inflateViews(NotificationData.Entry entry, ViewGroup parent)
         if (expandedOneU != null) {
             SizeAdaptiveLayout.LayoutParams params =
                     new SizeAdaptiveLayout.LayoutParams(expandedOneU.getLayoutParams());
-            params.minHeight = minHeight;
-            params.maxHeight = minHeight;
+            params.minHeight = rowHeight;
+            params.maxHeight = rowHeight;
             adaptive.addView(expandedOneU, params);
         }
         if (expandedLarge != null) {
             SizeAdaptiveLayout.LayoutParams params =
                     new SizeAdaptiveLayout.LayoutParams(expandedLarge.getLayoutParams());
-            params.minHeight = minHeight+1;
+            params.minHeight = rowHeight+1;
             params.maxHeight = maxHeight;
             adaptive.addView(expandedLarge, params);
         }