commit 559146fc98ba0c1a272c37e78c38f7a9f145997a
author Daniel Sandler <dsandler@android.com> Wed May 16 08:06:02 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 16 08:06:02 2012 -0700
tree d2b753542b1ac831c549bbd406145a62f1e1911e
parent e2c6d77c5fe8aabf6617c8cec0e8fcd53f12ab69
parent 2c3e9e199a9548cc5b1966140727d993efbc31ea

Merge "New fonts in notifications." into jb-dev

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 ac92e1a..a352748 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -539,14 +539,14 @@
         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);
         }