AlignParentStart/End RTL fixes. Fixes b/10824349.
Can't use alignParentStart and alignParentLeft together
on older versions of android. Need to use the styles trick.
Change-Id: I18a12f5d3a37c642168c51fcda1d35f67ac53095
diff --git a/res/layout/child_folder_item.xml b/res/layout/child_folder_item.xml
index d1f3a53..0999884 100644
--- a/res/layout/child_folder_item.xml
+++ b/res/layout/child_folder_item.xml
@@ -35,15 +35,12 @@
<ImageView
android:id="@+id/color_block"
- style="@style/FolderItemIcon"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true" />
+ style="@style/FolderColorBoxStyle" />
<TextView
android:id="@+id/unread"
style="@style/UnreadCountWithMarginEndStyle"
android:layout_alignWithParentIfMissing="true"
- android:layout_alignParentRight="true"
android:layout_toLeftOf="@id/folder_parent_icon"
android:textColor="@color/folder_name_color_primary_invertible" />
diff --git a/res/layout/conversation_message_upper_header_text.xml b/res/layout/conversation_message_upper_header_text.xml
index e154152..849a058 100644
--- a/res/layout/conversation_message_upper_header_text.xml
+++ b/res/layout/conversation_message_upper_header_text.xml
@@ -31,8 +31,6 @@
android:id="@+id/upper_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:visibility="gone"
android:lines="1"
style="@style/MessageHeaderUpperDateStyle" />
@@ -50,31 +48,23 @@
android:layout_height="wrap_content"
android:layout_toStartOf="@id/attachment"
android:layout_toLeftOf="@id/attachment"
- android:layout_alignParentStart="true"
- android:layout_alignParentLeft="true"
style="@style/MessageSenderNameStyle" />
<TextView
android:id="@+id/sender_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/sender_name"
- android:layout_alignParentStart="true"
- android:layout_alignParentLeft="true"
style="@style/MessageHeaderSubtitleStyle" />
<TextView
android:id="@+id/send_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/sender_email"
- android:layout_alignParentStart="true"
- android:layout_alignParentLeft="true"
style="@style/MessageHeaderSubtitleStyle" />
<TextView
android:id="@+id/email_snippet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/sender_name"
- android:layout_alignParentStart="true"
- android:layout_alignParentLeft="true"
style="@style/MessageHeaderSnippetStyle" />
</RelativeLayout>
diff --git a/res/layout/folder_item.xml b/res/layout/folder_item.xml
index 0435fdd..5d60e30 100644
--- a/res/layout/folder_item.xml
+++ b/res/layout/folder_item.xml
@@ -28,25 +28,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:visibility="gone"
- android:src="@drawable/folder_parent_icon" />
+ android:src="@drawable/folder_parent_icon"
+ style="@style/FolderParentIconStyle" />
<ImageView
android:id="@+id/color_block"
- style="@style/FolderItemIcon"
- android:layout_alignParentStart="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true" />
+ style="@style/FolderColorBoxStyle" />
<FrameLayout
android:id="@+id/message_counts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
android:duplicateParentState="true"
style="@style/FolderListItemEndStyle" >
@@ -66,11 +60,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentLeft="true"
android:duplicateParentState="true"
android:visibility="gone"
- style="@style/FolderListItemStartStyle" />
+ style="@style/FolderListIconStyle" />
<TextView
android:id="@+id/name"
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index cd736b6..39511a0 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -86,6 +86,11 @@
<item name="android:layout_marginStart">@dimen/folder_list_item_start_margin</item>
</style>
+ <style name="FolderListItemEndStyle">
+ <item name="android:layout_marginEnd">@dimen/folder_list_item_end_margin</item>
+ <item name="android:layout_alignParentEnd">true</item>
+ </style>
+
<style name="DismissSeparatorStyle">
<item name="android:layout_marginStart">@dimen/dismiss_separator_padding</item>
</style>
@@ -126,6 +131,7 @@
<style name="UnreadCountWithMarginEndStyle" parent="UnreadCount">
<item name="android:layout_marginEnd">@dimen/folder_list_item_end_margin</item>
+ <item name="android:layout_alignParentEnd">true</item>
</style>
<style name="UnseenCountWithMarginEndStyle" parent="UnseenCount">
@@ -227,4 +233,27 @@
<item name="android:paddingEnd">@dimen/vacation_responder_inner_padding</item>
</style>
+ <style name="MessageSenderNameStyle" parent="AbstractMessageSenderNameStyle">
+ <item name="android:layout_alignParentStart">true</item>
+ </style>
+
+ <style name="MessageHeaderSubtitleStyle" parent="AbstractMessageHeaderSubtitleStyle">
+ <item name="android:layout_alignParentStart">true</item>
+ </style>
+
+ <style name="FolderColorBoxStyle" parent="AbstractFolderColorBoxStyle">
+ <item name="android:layout_alignParentStart">true</item>
+ </style>
+
+ <style name="FolderListIconStyle">
+ <item name="android:layout_alignParentStart">true</item>
+ </style>
+
+ <style name="MessageHeaderUpperDateStyle" parent="AbstractMessageHeaderUpperDateStyle">
+ <item name="android:layout_alignParentEnd">true</item>
+ </style>
+
+ <style name="FolderParentIconStyle">
+ <item name="android:layout_alignParentEnd">true</item>
+ </style>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7f25800..dd780d4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -222,18 +222,26 @@
<item name="android:layout_marginTop">@dimen/message_header_presence_top_margin</item>
</style>
- <style name="MessageSenderNameStyle">
+ <style name="AbstractMessageSenderNameStyle">
<item name="android:singleLine">true</item>
<item name="android:textSize">@dimen/message_sender_name_text_size</item>
<item name="android:textColor">@color/conv_header_text_dark</item>
</style>
- <style name="MessageHeaderSubtitleStyle">
+ <style name="MessageSenderNameStyle" parent="AbstractMessageSenderNameStyle">
+ <item name="android:layout_alignParentLeft">true</item>
+ </style>
+
+ <style name="AbstractMessageHeaderSubtitleStyle">
<item name="android:singleLine">true</item>
<item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
<item name="android:textColor">@color/conv_header_text_dark</item>
</style>
+ <style name="MessageHeaderSubtitleStyle" parent="AbstractMessageHeaderSubtitleStyle">
+ <item name="android:layout_alignParentLeft">true</item>
+ </style>
+
<style name="MessageHeaderSnippetStyle">
<item name="android:lines">2</item>
<item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
@@ -262,10 +270,14 @@
<item name="android:drawableLeft">@drawable/ic_show_images_holo_light</item>
</style>
- <style name="MessageHeaderUpperDateStyle" parent="MessageHeaderSmallStyle">
+ <style name="AbstractMessageHeaderUpperDateStyle" parent="MessageHeaderSmallStyle">
<item name="android:minHeight">24dp</item>
</style>
+ <style name="MessageHeaderUpperDateStyle" parent="AbstractMessageHeaderUpperDateStyle">
+ <item name="android:layout_alignParentRight">true</item>
+ </style>
+
<style name="AbstractMessageAttachmentsHeaderStyle" parent="MessageHeaderSmallStyle">
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">true</item>
@@ -318,13 +330,13 @@
</style>
<!-- Folder styles -->
- <style name="FolderItemIcon">
+ <style name="AbstractFolderColorBoxStyle">
<item name="android:layout_height">@dimen/folder_swatch_height</item>
<item name="android:layout_width">@dimen/folder_list_folder_color_width</item>
+ <item name="android:layout_alignParentTop">true</item>
</style>
- <style name="FolderColorBoxStyle" parent="@style/FolderItemIcon">
- <item name="android:layout_alignParentTop">true</item>
+ <style name="FolderColorBoxStyle" parent="AbstractFolderColorBoxStyle">
<item name="android:layout_alignParentLeft">true</item>
</style>
@@ -562,8 +574,17 @@
<item name="android:layout_marginLeft">@dimen/folder_list_item_start_margin</item>
</style>
+ <style name="FolderListIconStyle">
+ <item name="android:layout_alignParentLeft">true</item>
+ </style>
+
+ <style name="FolderParentIconStyle">
+ <item name="android:layout_alignParentRight">true</item>
+ </style>
+
<style name="FolderListItemEndStyle">
<item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
+ <item name="android:layout_alignParentRight">true</item>
</style>
<style name="FolderListItemStyle">
@@ -607,6 +628,7 @@
<style name="UnreadCountWithMarginEndStyle" parent="UnreadCount">
<item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
+ <item name="android:layout_alignParentRight">true</item>
</style>
<style name="UnseenCountWithMarginEndStyle" parent="UnseenCount">
