commit 1e99a0aad16cae8c8d094ff4ee47fd025ce8acda
author Isaac Katzenelson <isaack@android.com> Tue Jul 26 17:21:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 26 17:21:41 2011 -0700
tree c5a9dc7dddfb8fdffd92365aaea681fc4a2496e3
parent e09c1147f14f160740b4b2bfc8836d283a653b8e
parent 2d9e3b252a7d672fa973919e68bfd20fb8c20188

Merge "Fix missing "add to my contacts" button in landscape"

res/layout-sw580dp-w1000dp/contact_detail_fragment.xml

diff --git a/res/layout-sw580dp-w1000dp/contact_detail_fragment.xml b/res/layout-sw580dp-w1000dp/contact_detail_fragment.xml
index 9dd3690..f4c95f8 100644
--- a/res/layout-sw580dp-w1000dp/contact_detail_fragment.xml
+++ b/res/layout-sw580dp-w1000dp/contact_detail_fragment.xml
@@ -32,8 +32,9 @@
     <!-- Real list -->
     <LinearLayout
         android:orientation="horizontal"
+        android:layout_weight="1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0dip">
 
         <ImageView android:id="@+id/photo"
             android:scaleType="centerCrop"

res/layout-w470dp/contact_detail_fragment.xml

diff --git a/res/layout-w470dp/contact_detail_fragment.xml b/res/layout-w470dp/contact_detail_fragment.xml
index 42266d5..17cbc2d 100644
--- a/res/layout-w470dp/contact_detail_fragment.xml
+++ b/res/layout-w470dp/contact_detail_fragment.xml
@@ -14,15 +14,17 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/contact_detail"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0px"
+        android:layout_weight="1" >
 
         <ImageView android:id="@+id/photo"
             android:scaleType="centerCrop"
@@ -87,5 +89,5 @@
         android:layout_alignParentTop="true"
         android:background="@android:color/transparent"
         android:visibility="gone"/>
-</RelativeLayout>
+</LinearLayout>