From 321452da28548e1cf566fa88bbe5f0faf0f74cb7 Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Tue, 24 Apr 2012 11:41:07 -0400
Subject: [PATCH] Set row height to the row height not the notification height.

Bug: 6376501
Change-Id: I41567b11fcb1d39bc75ef782faa8287bbb1e4ca8
---
 packages/SystemUI/res/values-hdpi/dimens.xml  | 26 -------------------
 packages/SystemUI/res/values/dimens.xml       |  2 +-
 .../systemui/statusbar/BaseStatusBar.java     |  4 ++-
 3 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 packages/SystemUI/res/values-hdpi/dimens.xml

diff --git a/packages/SystemUI/res/values-hdpi/dimens.xml b/packages/SystemUI/res/values-hdpi/dimens.xml
deleted file mode 100644
index 7cd318cc5cbed..0000000000000
--- a/packages/SystemUI/res/values-hdpi/dimens.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2011, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
--->
-<resources>
-    <!-- thickness (height) of each notification row, including any separators or padding -->
-    <!-- Note: this is 64dip + 1px divider = 97px. -->
-    <dimen name="notification_height">99px</dimen>
-
-    <!-- thickness (height) of dividers between each notification row; see math for
-         notification_height above -->
-    <dimen name="notification_divider_height">4px</dimen>
-</resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 531f154af19ae..6c29c6e7c179c 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -72,7 +72,7 @@
     <dimen name="status_bar_icon_padding">0dp</dimen>
 
     <!-- thickness (height) of dividers between each notification row -->
-    <dimen name="notification_divider_height">4dp</dimen>
+    <dimen name="notification_divider_height">2dp</dimen>
 
     <!-- Notification drawer tuning parameters (phone UI) -->
     <!-- Initial velocity of the shade when expanding on its own -->
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 8ea08c738692b..028fcbee7ac0f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -436,6 +436,8 @@ public abstract class BaseStatusBar extends SystemUI implements
     }
 
     protected  boolean inflateViews(NotificationData.Entry entry, ViewGroup parent) {
+        int rowHeight =
+                mContext.getResources().getDimensionPixelSize(R.dimen.notification_height);
         int minHeight =
                 mContext.getResources().getDimensionPixelSize(R.dimen.notification_min_height);
         int maxHeight =
@@ -462,7 +464,7 @@ public abstract class BaseStatusBar extends SystemUI implements
             lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
             expandable = Boolean.TRUE;
         } else {
-            lp.height = minHeight;
+            lp.height = rowHeight;
         }
         row.setLayoutParams(lp);
         row.setTag(R.id.expandable_tag, expandable);