Merge heads

MyTracks/AndroidManifest.xml

@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   android:installLocation="auto"
-  android:versionCode="45"
+  android:versionCode="47"
   android:versionName="2.0"
   package="com.google.android.maps.mytracks" >
 

MyTracks/res/drawable/track_widget_record_button_background.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2012 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle" >
+  <solid android:color="@android:color/transparent" />
+  <padding
+    android:bottom="8dp"
+    android:left="8dp"
+    android:right="8dp"
+    android:top="8dp" />
+  <corners android:radius="8dp" />
+  <stroke
+    android:color="@android:color/white"
+    android:width="2dp" />
+</shape>

MyTracks/res/drawable/track_widget_stop_button_background.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2012 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle" >
+  <solid android:color="@color/track_widget_red" />
+  <padding
+    android:bottom="8dp"
+    android:left="8dp"
+    android:right="8dp"
+    android:top="8dp" />
+  <corners android:radius="8dp" />
+</shape>

MyTracks/res/layout/help.xml

@@ -72,18 +72,18 @@ limitations under the License.
       <TextView
         android:text="@string/help_share_friends_answer"
         style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_send_track_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:id="@+id/help_send_track_answer"
+        style="@style/HelpAnswer" />
       <TextView
         android:text="@string/help_maps_public_unlisted_question"
         style="@style/HelpQuestion" />
       <TextView
         android:id="@+id/help_maps_public_unlisted_answer"
         style="@style/HelpAnswer" />
-      <TextView
-        android:text="@string/help_google_services_question"
-        style="@style/HelpQuestion" />
-      <TextView
-        android:id="@+id/help_google_services_answer"
-        style="@style/HelpAnswer" />
       <TextView
         android:text="@string/help_share_visibility_question"
         style="@style/HelpQuestion" />

MyTracks/res/layout/track_widget.xml

@@ -19,18 +19,18 @@ limitations under the License.
   android:layout_width="fill_parent"
   android:padding="@dimen/widget_margin" >
   <LinearLayout
-    android:background="@drawable/app_widget_background"
+    android:background="@drawable/track_widget_background"
     android:layout_height="fill_parent"
     android:layout_width="fill_parent"
     android:orientation="horizontal" >
     <ImageButton
       android:background="@android:color/transparent"
       android:contentDescription="@string/my_tracks_app_name"
-      android:id="@+id/track_widget_button"
+      android:id="@+id/track_widget_icon"
       android:layout_height="fill_parent"
       android:layout_width="wrap_content"
       android:padding="8dp"
-      android:src="@drawable/app_widget_button_disabled" />
+      android:src="@drawable/my_tracks_icon" />
     <LinearLayout
       android:clickable="true"
       android:id="@+id/track_widget_statistics"
@@ -80,6 +80,18 @@ limitations under the License.
           android:id="@+id/track_widget_speed_label"
           style="@style/TrackWidgetLabel" />
       </LinearLayout>
+      <ImageButton
+        android:background="@drawable/track_widget_record_button_background"
+        android:contentDescription="@string/menu_record_track"
+        android:id="@+id/track_widget_record_button"
+        android:src="@drawable/track_widget_record_button"
+        style="@style/TrackWidgetButton" />
+      <ImageButton
+        android:background="@drawable/track_widget_stop_button_background"
+        android:contentDescription="@string/menu_stop_recording"
+        android:id="@+id/track_widget_stop_button"
+        android:src="@drawable/track_widget_stop_button"
+        style="@style/TrackWidgetButton" />
     </LinearLayout>
   </LinearLayout>
 </FrameLayout>

MyTracks/res/layout/upload_result.xml

@@ -33,6 +33,7 @@ limitations under the License.
         android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:padding="4dp"
         android:src="@drawable/success" />
       <LinearLayout
         android:layout_gravity="center_vertical"
@@ -60,6 +61,7 @@ limitations under the License.
         android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:padding="4dp"
         android:src="@drawable/success" />
       <LinearLayout
         android:layout_gravity="center_vertical"
@@ -87,6 +89,7 @@ limitations under the License.
         android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:padding="4dp"
         android:src="@drawable/success" />
       <LinearLayout
         android:layout_gravity="center_vertical"