From 7aff75446d54576f93453bc2cdb7308ce9531cb5 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 22 Nov 2010 17:32:43 -0800
Subject: [PATCH] Change "id" to "android:id"

Simply changing them broke the layout.  I couldn't really figure out how to
get the same layout, so ended up using LinearLayouts.

Also removed message_compose_divider, which didn't really add any value
to its parent, horizontalDivider.

Bug 3216086

Change-Id: If29b344e4dc63902d1cc7d5bebdacb9a245ce8d1
---
 res/layout-xlarge/message_compose.xml | 77 ++++++++++++++-------------
 res/values-xlarge/styles.xml          |  4 --
 2 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/res/layout-xlarge/message_compose.xml b/res/layout-xlarge/message_compose.xml
index 077e47198..75641103e 100644
--- a/res/layout-xlarge/message_compose.xml
+++ b/res/layout-xlarge/message_compose.xml
@@ -153,56 +153,57 @@
                 />
 
             <!--  quoted text bar -->
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/quoted_text_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingTop="4dip"
                 android:paddingBottom="4dip"
                 >
                 <View
-                    id="@+id/topDivider"
+                    android:layout_width="match_parent"
                     android:layout_alignParentTop="true"
-                    style="@style/message_compose_divider"
+                    style="@style/horizontalDivider"
                     />
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    >
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:layout_gravity="left|center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="?android:attr/textColorSecondaryInverse"
+                        android:text="@string/message_compose_quoted_text_label"
+                        />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_gravity="right|center_vertical"
+                        android:gravity="right|center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="?android:attr/textColorSecondaryInverse"
+                        android:text="@string/message_compose_include_quoted_text_checkbox_label"
+                        />
+                    <CheckBox
+                        android:id="@+id/include_quoted_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:layout_gravity="center"
+                        />
+                </LinearLayout>
                 <View
-                    id="@+id/bottomDivider"
+                    android:layout_width="match_parent"
                     android:layout_alignParentBottom="true"
-                    style="@style/message_compose_divider"
+                    style="@style/horizontalDivider"
                     />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_below="@id/topDivider"
-                    android:layout_above="@id/bottomDivider"
-                    android:layout_centerVertical="true"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
-                    android:text="@string/message_compose_quoted_text_label"
-                    />
-                <CheckBox
-                    android:id="@+id/include_quoted_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_below="@id/topDivider"
-                    android:layout_above="@id/bottomDivider"
-                    android:layout_centerVertical="true"
-                    />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toLeftOf="@id/include_quoted_text"
-                    android:layout_below="@id/topDivider"
-                    android:layout_above="@id/bottomDivider"
-                    android:layout_centerVertical="true"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
-                    android:text="@string/message_compose_include_quoted_text_checkbox_label"
-                    />
-            </RelativeLayout>
-
+            </LinearLayout>
             <!--
                 Quoted text
                 TODO: Don't put a webview in a scroll view.
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index a94feff29..9a49d1a1e 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -78,8 +78,4 @@
         <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
-
-    <style name="message_compose_divider" parent="horizontalDivider">
-        <item name="android:layout_width">match_parent</item>
-    </style>
 </resources>