commit 65f8cae5f848b63ae695da63b56fc9270513078a
author Dmitri Plotnikov <dplotnikov@google.com> Fri Dec 10 16:38:22 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Fri Dec 10 16:38:22 2010 -0800
tree 0a42a158fa40a645637fcb4c23a4aa9498cb3bfe
parent a03c1980ab07a7fa2bbee9398aa71b1e2b55e763

Fixing handling of top/bottom margins in InterpolatingLayout

Change-Id: Ib023021f31c4a813fe7bf976b42f1101da91ce9a

res/layout-xlarge/contact_browser.xml

diff --git a/res/layout-xlarge/contact_browser.xml b/res/layout-xlarge/contact_browser.xml
index 4e20171..53177ce 100644
--- a/res/layout-xlarge/contact_browser.xml
+++ b/res/layout-xlarge/contact_browser.xml
@@ -45,8 +45,9 @@
 
             <FrameLayout
                 android:id="@+id/list_container"
-                android:layout_height="match_parent"
+                android:layout_height="0dip"
                 android:layout_width="match_parent"
+                android:layout_weight="1"
                 android:background="@drawable/list_background_holo" />
         </LinearLayout>
 

src/com/android/contacts/widget/InterpolatingLayout.java

diff --git a/src/com/android/contacts/widget/InterpolatingLayout.java b/src/com/android/contacts/widget/InterpolatingLayout.java
index fb0c371..63fc2f6 100644
--- a/src/com/android/contacts/widget/InterpolatingLayout.java
+++ b/src/com/android/contacts/widget/InterpolatingLayout.java
@@ -244,7 +244,8 @@
                         break;
                     case LayoutParams.MATCH_PARENT:
                         childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(
-                                parentHeight, MeasureSpec.EXACTLY);
+                                parentHeight - params.topMargin - params.bottomMargin,
+                                MeasureSpec.EXACTLY);
                         break;
                     default:
                         childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(
@@ -304,7 +305,8 @@
                     right - left - offset - rightMargin,
                     bottom - top - params.bottomMargin);
 
-            Gravity.apply(gravity, child.getMeasuredWidth(), child.getMeasuredHeight(),
+            int height = Math.max(child.getMeasuredHeight(), mInRect.height());
+            Gravity.apply(gravity, child.getMeasuredWidth(), height,
                     mInRect, mOutRect);
             child.layout(mOutRect.left, mOutRect.top, mOutRect.right, mOutRect.bottom);