summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChiao Cheng <chiaocheng@google.com>2013-06-04 14:10:39 -0700
committerThe Android Automerger <android-build@android.com>2013-06-05 15:42:21 -0700
commite2becb13f5a73fab78c7b17a606e844d08910073 (patch)
treec1fdbefdfb29f6d804cbc2847155c458f9197712
parentfd61ce26ba0a7df3bc80eb9a93b94bb89d45c57d (diff)
downloadContacts-e2becb13f5a73fab78c7b17a606e844d08910073.tar.gz
Fix RTL layout for 10" tablet in landscape mode.
The main layout was using the InterpolatingLayout which does not properly support RTL. In this particular case, the features of the InterpolatingLayout is not used and can be replaced with a standard LinearLayout. Bug: 9261442 Change-Id: Ie49a975d83287e1939b3449559db7f6290082865
-rw-r--r--res/layout-sw680dp-land/people_activity.xml27
1 files changed, 7 insertions, 20 deletions
diff --git a/res/layout-sw680dp-land/people_activity.xml b/res/layout-sw680dp-land/people_activity.xml
index 371f5e0b6..1becbd19e 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"