From 235fd16e5acbc7c72162e233ade178df53b9bbda Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 3 Jan 2012 14:47:54 -0800
Subject: [PATCH] Support multiple lines on Send to Google CheckBox and
 RadioButtons

- Center align the CheckBox to the ImageView
- Note that to support line wrapping inside a TableLayout, need to
set the layout_width to 0dp.
---
 .../res/layout/mytracks_send_to_google.xml    | 122 +++++++-----------
 MyTracks/res/values/strings.xml               |   2 -
 MyTracks/res/values/styles.xml                |  22 ++++
 3 files changed, 66 insertions(+), 80 deletions(-)

diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/mytracks_send_to_google.xml
index 88fc3a5e9..3d75f6688 100644
--- a/MyTracks/res/layout/mytracks_send_to_google.xml
+++ b/MyTracks/res/layout/mytracks_send_to_google.xml
@@ -18,106 +18,72 @@ limitations under the License.
   android:layout_height="fill_parent"
   android:layout_width="fill_parent"
   android:orientation="vertical">
-  <LinearLayout
+  <TextView
     android:background="@drawable/list_bar"
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent">
-    <TextView
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="10dip"
-      android:layout_width="fill_parent"
-      android:text="@string/send_google_title"
-      android:textColor="#fff"
-      android:textSize="20dip"/>
-  </LinearLayout>
+    android:layout_width="fill_parent"
+    android:paddingLeft="10dp"
+    android:text="@string/send_google_title"
+    android:textColor="@color/white"
+    android:textSize="20sp"/>
   <ScrollView
-    android:layout_height="0dip"
-    android:layout_marginBottom="5dip"
-    android:layout_marginLeft="5dip"
-    android:layout_marginTop="5dip"
+    android:layout_height="0dp"
+    android:layout_margin="5dp"
     android:layout_weight="1"
     android:layout_width="fill_parent">
     <TableLayout
       android:layout_height="wrap_content"
       android:layout_width="fill_parent"
       android:stretchColumns="1">
-      
-      <!-- Google My Maps -->
+
+      <!-- Google Maps -->
       <TableRow>
         <ImageView
+          android:src="@drawable/mymaps_icon"
+          style="@style/SendGoogleImageView"/>
+        <CheckBox
+          android:id="@+id/send_google_my_maps"
+          android:text="@string/send_google_my_maps"
+          style="@style/SendGoogleCheckBox"/>
+      </TableRow>
+      <TableRow>
+        <RadioGroup
+          android:id="@+id/send_google_my_maps_group"
+          android:layout_column="1"
           android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
-          android:src="@drawable/mymaps_icon"/>
-        <LinearLayout
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="10dip"
-          android:layout_width="fill_parent"
-          android:orientation="vertical">
-          <CheckBox
-            android:checked="true"
-            android:id="@+id/send_google_my_maps"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:text="@string/send_google_my_maps"
-            android:textSize="18dip"/>
-          <RadioGroup
-            android:id="@+id/send_google_my_maps_group"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent">
-            <RadioButton
-              android:id="@+id/send_google_new_map"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"
-              android:text="@string/send_google_new_map"/>
-            <RadioButton
-              android:id="@+id/send_google_existing_map"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"
-              android:text="@string/send_google_existing_map"/>
-          </RadioGroup>
-        </LinearLayout>
+          android:layout_marginLeft="10dp"
+          android:layout_width="0dp">
+          <RadioButton
+            android:id="@+id/send_google_new_map"
+            android:text="@string/send_google_new_map"
+            style="@style/SendGoogleRadioButton"/>
+          <RadioButton
+            android:id="@+id/send_google_existing_map"
+            android:text="@string/send_google_existing_map"
+            style="@style/SendGoogleRadioButton"/>
+        </RadioGroup>
       </TableRow>
 
       <!-- Google Fusion Tables -->
       <TableRow>
         <ImageView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
-          android:src="@drawable/googledocs_icon"/>
-        <LinearLayout
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="10dip"
-          android:layout_width="fill_parent"
-          android:orientation="vertical">
-          <CheckBox
-            android:checked="true"
-            android:id="@+id/send_google_fusion_tables"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:text="@string/send_google_fusion_tables"
-            android:textSize="18dip"/>
-        </LinearLayout>
+          android:src="@drawable/googledocs_icon"
+          style="@style/SendGoogleImageView"/>
+        <CheckBox
+          android:id="@+id/send_google_fusion_tables"
+          android:text="@string/send_google_fusion_tables"
+          style="@style/SendGoogleCheckBox"/>
       </TableRow>
 
       <!-- Google Docs -->
       <TableRow android:id="@+id/send_google_docs_table_row">
         <ImageView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
-          android:src="@drawable/googledocs_icon"/>
-        <LinearLayout
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="10dip"
-          android:layout_width="fill_parent"
-          android:orientation="vertical">
-          <CheckBox
-            android:checked="true"
-            android:id="@+id/send_google_docs"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:text="@string/send_google_docs"
-            android:textSize="18dip"/>
-        </LinearLayout>
+          android:src="@drawable/googledocs_icon"
+          style="@style/SendGoogleImageView"/>
+        <CheckBox
+          android:id="@+id/send_google_docs"
+          android:text="@string/send_google_docs"
+          style="@style/SendGoogleCheckBox"/>
       </TableRow>
     </TableLayout>
   </ScrollView>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index d1d7db4c8..206873896 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1129,7 +1129,6 @@ limitations under the License.
     translation_description="When sending a track to Google Maps, the radio option to use an
       existing map as opposed to create a new map.
 
-      Character limit: ~21 (1 line)
       Screenshot: send_google_choose_service.png">
     Use existing map
   </string>
@@ -1151,7 +1150,6 @@ limitations under the License.
     translation_description="When sending a track to Google Maps, the radio option to create a
       new map as opposed to use an existing map.
 
-      Character limit: ~21 (1 line)
       Screenshot: send_google_choose_service.png">
     Create new map
   </string>
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index e1896c5b8..868e3692c 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -107,6 +107,28 @@ limitations under the License.
     <item name="android:layout_width">wrap_content</item>
   </style>
 
+  <!-- Send Google CheckBox -->
+  <style name="SendGoogleCheckBox">
+    <item name="android:checked">true</item>
+    <item name="android:layout_height">fill_parent</item>
+    <item name="android:layout_marginLeft">10dp</item>
+    <item name="android:layout_width">0dp</item>
+    <item name="android:textSize">18sp</item>
+  </style>
+
+  <!-- Send Google ImageView -->
+  <style name="SendGoogleImageView">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+  </style>
+
+  <!-- Send Google RadioButton -->
+  <style name="SendGoogleRadioButton">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:textSize">18sp</item>
+  </style>
+
   <style name="SensorStateLabel">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">fill_parent</item>