commit 25affe08433a1709ab49a42a2563894533000e1e
author Chiao Cheng <chiaocheng@google.com> Tue Jun 04 18:46:42 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 04 18:46:42 2013 -0700
tree 0526200835e0f349ddf912d8076f342cbd8ebee0
parent 346959f59d5e96517a9eccbc43570b0dfbeb0e36
parent 15ad27b4b981c4808e1fa155e0cc74574c13a586

am 15ad27b4: Fix RTL layout for 10" tablet in landscape mode.

* commit '15ad27b4b981c4808e1fa155e0cc74574c13a586':
  Fix RTL layout for 10" tablet in landscape mode.

res/layout-sw680dp-land/people_activity.xml

diff --git a/res/layout-sw680dp-land/people_activity.xml b/res/layout-sw680dp-land/people_activity.xml
index 371f5e0..1becbd1 100644
--- a/res/layout-sw680dp-land/people_activity.xml
+++ b/res/layout-sw680dp-land/people_activity.xml
@@ -22,21 +22,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.android.contacts.widget.InterpolatingLayout
+    <LinearLayout
         android:id="@+id/main_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="horizontal"
         android:splitMotionEvents="true">
 
         <FrameLayout
             android:id="@+id/browse_view"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:layout_weight="1"
             android:minWidth="100dip"
-            ex:layout_narrowParentWidth="1000dip"
-            ex:layout_narrowWidth="276dip"
-            ex:layout_wideParentWidth="1280dip"
-            ex:layout_wideWidth="376dip"
             android:background="@drawable/list_background_holo"
             android:visibility="gone">
 
@@ -58,14 +56,9 @@
         <view
             class="com.android.contacts.widget.TransitionAnimationView"
             android:id="@+id/contact_details_view"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            ex:layout_narrowParentWidth="800dip"
-            ex:layout_narrowMarginLeft="0dip"
-            ex:layout_narrowMarginRight="0dip"
-            ex:layout_wideParentWidth="1280dip"
-            ex:layout_wideMarginLeft="0dip"
-            ex:layout_wideMarginRight="0dip"
+            android:layout_weight="2"
             android:visibility="gone">
 
             <!-- This layout includes all possible views needed for a contact detail page -->
@@ -89,12 +82,6 @@
             android:id="@+id/group_details_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            ex:layout_narrowParentWidth="800dip"
-            ex:layout_narrowMarginLeft="0dip"
-            ex:layout_narrowMarginRight="0dip"
-            ex:layout_wideParentWidth="1280dip"
-            ex:layout_wideMarginLeft="0dip"
-            ex:layout_wideMarginRight="0dip"
             android:visibility="gone">
 
             <!-- This is the group detail page -->
@@ -145,7 +132,7 @@
 
         </LinearLayout>
 
-    </com.android.contacts.widget.InterpolatingLayout>
+    </LinearLayout>
 
     <com.android.contacts.widget.InterpolatingLayout
         android:id="@+id/contacts_unavailable_view"