merge heads

MyTracks/res/layout/mytracks_waypoint_details.xml

@@ -49,8 +49,7 @@ limitations under the License.
          android:layout_width="fill_parent"
          android:layout_height="wrap_content"
          android:singleLine="true"
-         android:autoText="true"
-         android:capitalize="words"
+         android:inputType="textAutoCorrect|textCapWords"
          android:selectAllOnFocus="true"
          android:hint="@string/marker_detail_marker_name"
          android:imeOptions="actionNext"/>
@@ -78,8 +77,7 @@ limitations under the License.
           android:layout_width="fill_parent"
           android:layout_height="0dp"
           android:singleLine="false"
-          android:autoText="true"
-          android:capitalize="sentences"
+          android:inputType="textAutoCorrect|textCapSentences"
           android:selectAllOnFocus="true"
           android:minLines="5"
           android:maxLines="50"

MyTracks/res/layout/stats.xml

@@ -204,8 +204,6 @@ limitations under the License.
             style="@style/StatsUnit" />
           <TextView
 	          style="@style/StatsDivider" />
-            android:layout_height="3dp"
-            android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/average_moving_speed_unit_label_bottom"
             style="@style/StatsUnit" />

MyTracks/res/layout/track_detail.xml

@@ -52,8 +52,7 @@ limitations under the License.
           android:src="@drawable/track"
           />
         <EditText
-          android:autoText="true"
-          android:capitalize="words"
+          android:inputType="textAutoCorrect|textCapWords"
           android:hint="@string/track_detail_track_name"
           android:id="@+id/track_detail_track_name"
           android:imeOptions="actionNext"
@@ -81,8 +80,7 @@ limitations under the License.
         android:text="@string/track_detail_track_description"
         />
       <EditText
-        android:autoText="true"
-        android:capitalize="sentences"
+        android:inputType="textAutoCorrect|textCapSentences"
         android:hint="@string/track_detail_track_description"
         android:id="@+id/track_detail_track_description"
         android:imeOptions="actionDone"

MyTracks/res/layout/track_widget.xml

@@ -54,7 +54,7 @@ limitations under the License.
           style="@style/WidgetTextView"
           android:text="@string/stat_total_distance" />
       </LinearLayout>
-      <ImageView
+      <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="1dp"
         android:background="@color/appwidget_hr" />
@@ -70,7 +70,7 @@ limitations under the License.
           style="@style/WidgetTextView"
           android:text="@string/stat_moving_time" />
       </LinearLayout>
-      <ImageView
+      <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="1dp"
         android:background="@color/appwidget_hr" />

MyTracks/res/layout/upload_result.xml

@@ -18,20 +18,16 @@ limitations under the License.
   android:layout_height="fill_parent"
   android:layout_margin="8dp"
   android:layout_width="fill_parent" >
-
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
     android:orientation="vertical" >
-
     <!-- Google Maps result -->
-
     <LinearLayout
       android:id="@+id/upload_result_maps_result"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:orientation="horizontal" >
-
       <ImageView
         android:contentDescription="@string/generic_success_title"
         android:id="@+id/upload_result_maps_result_icon"
@@ -39,35 +35,29 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/success" />
-
       <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
-
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_maps" />
-
+          android:text="@string/send_google_maps"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Small"
-          android:text="@string/send_google_maps_url" />
+          android:text="@string/send_google_maps_url"
+          style="@android:style/TextAppearance.DeviceDefault.Small" />
       </LinearLayout>
     </LinearLayout>
-
     <!-- Google Fusion Tables result -->
-
     <LinearLayout
       android:id="@+id/upload_result_fusion_tables_result"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:orientation="horizontal" >
-
       <ImageView
         android:contentDescription="@string/generic_success_title"
         android:id="@+id/upload_result_fusion_tables_result_icon"
@@ -75,35 +65,29 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/success" />
-
       <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
-
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_fusion_tables" />
-
+          android:text="@string/send_google_fusion_tables"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Small"
-          android:text="@string/send_google_fusion_tables_url" />
+          android:text="@string/send_google_fusion_tables_url"
+          style="@android:style/TextAppearance.DeviceDefault.Small" />
       </LinearLayout>
     </LinearLayout>
-
     <!-- Google Docs result -->
-
     <LinearLayout
       android:id="@+id/upload_result_docs_result"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:orientation="horizontal" >
-
       <ImageView
         android:contentDescription="@string/generic_success_title"
         android:id="@+id/upload_result_docs_result_icon"
@@ -111,44 +95,37 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/success" />
-
       <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
-
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_docs" />
-
+          android:text="@string/send_google_docs"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Small"
-          android:text="@string/send_google_docs_url" />
+          android:text="@string/send_google_docs_url"
+          style="@android:style/TextAppearance.DeviceDefault.Small" />
       </LinearLayout>
     </LinearLayout>
-
     <!-- Footer -->
-
     <TextView
       android:id="@+id/upload_result_success_footer"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:padding="8dp"
-      style="@android:style/TextAppearance.DeviceDefault.Small"
-      android:text="@string/send_google_success_footer" />
-
+      android:text="@string/send_google_success_footer"
+      style="@android:style/TextAppearance.DeviceDefault.Small" />
     <TextView
       android:id="@+id/upload_result_error_footer"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:padding="8dp"
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/send_google_error" />
+      android:text="@string/send_google_error"
+      style="@android:style/TextAppearance.DeviceDefault.Medium" />
   </LinearLayout>
-
 </ScrollView>

MyTracks/res/layout/upload_service_chooser.xml

@@ -17,89 +17,75 @@ limitations under the License.
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
   android:layout_width="fill_parent" >
-
   <TableLayout
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
     android:layout_width="fill_parent"
     android:stretchColumns="1" >
-
     <TableRow android:id="@+id/send_google_maps_row" >
-
       <ImageView
         android:contentDescription="@string/send_google_maps"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/maps_icon" />
-
       <CheckBox
         android:id="@+id/send_google_maps"
         android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_width="0dp"
-        style="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:text="@string/send_google_maps" />
+        android:text="@string/send_google_maps"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
     </TableRow>
-
     <TableRow android:id="@+id/send_google_maps_option_row" >
-
       <RadioGroup
         android:layout_column="1"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_width="0dp" >
-
         <RadioButton
           android:id="@+id/send_google_new_map"
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_new_map" />
-
+          android:text="@string/send_google_new_map"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
         <RadioButton
           android:id="@+id/send_google_existing_map"
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_existing_map" />
+          android:text="@string/send_google_existing_map"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
       </RadioGroup>
     </TableRow>
-
     <TableRow android:id="@+id/send_google_fusion_tables_row" >
-
       <ImageView
         android:contentDescription="@string/send_google_fusion_tables"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/googledocs_icon" />
-
       <CheckBox
         android:id="@+id/send_google_fusion_tables"
         android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_width="0dp"
-        style="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:text="@string/send_google_fusion_tables" />
+        android:text="@string/send_google_fusion_tables"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
     </TableRow>
     <TableRow android:id="@+id/send_google_docs_row" >
-
       <ImageView
         android:contentDescription="@string/send_google_docs"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/googledocs_icon" />
-
       <CheckBox
         android:id="@+id/send_google_docs"
         android:layout_gravity="center_vertical"
         android:layout_height="fill_parent"
         android:layout_marginLeft="8dp"
         android:layout_width="0dp"
-        style="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:text="@string/send_google_docs" />
+        android:text="@string/send_google_docs"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
     </TableRow>
   </TableLayout>
-
 </ScrollView>