From aab2f7b1c4bc8ed0d13a3823542c82960a768882 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 2 Jul 2012 13:53:39 -0700
Subject: [PATCH] Update help content.

---
 MyTracks/res/layout/help.xml                  | 12 +++----
 MyTracks/res/values/strings.xml               | 32 ++++++++++---------
 .../android/apps/mytracks/HelpActivity.java   |  4 +--
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/MyTracks/res/layout/help.xml b/MyTracks/res/layout/help.xml
index 0446392d9..3ef001827 100644
--- a/MyTracks/res/layout/help.xml
+++ b/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" />
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 3cac364a2..363fdce45 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -739,19 +739,6 @@ limitations under the License.
     translation_description="In the 'Help' page, the question on elevation precision.">
     How precise is the elevation measurement?
   </string>
-  <string name="help_google_services_answer"
-    translation_description="In the 'Help' page, the answer on locations of google services.
-
-      %1$s url. E.g., 'maps.google.com'.
-      %2$s url. E.g., 'google.com/fusiontables'.
-      %3$s url. E.g., 'docs.google.com'.">
-    For Google Maps, go to %1$s and click on \"My Places\". For Google Fusion Tables, go to %2$s.
-    For Google Docs, go to %3$s.
-  </string>
-  <string name="help_google_services_question"
-    translation_description="In the 'Help' page, the question on locations of google services.">
-    Where are the tracks after sending to Google?
-  </string>
   <string name="help_gps_signal_answer"
     translation_description="In the 'Help' page, the answer on the GPS signal message.">
     For My Tracks to work, your phone needs to be in line-of-sight contact with the GPS satellites.
@@ -811,13 +798,28 @@ limitations under the License.
     translation_description="In the 'Help' page, the question on saved files.">
     What can I do with tracks after saving them to the SD card or sharing such files with friends?
   </string>
+  <string name="help_send_track_answer"
+    translation_description="In the 'Help' page, the answer on sending a track.
+
+      %1$s url. E.g., 'maps.google.com'.
+      %2$s url. E.g., 'google.com/fusiontables'.
+      %3$s url. E.g., 'docs.google.com'.">
+    You can send a track to Google Maps, Google Fusion Tables, and Google Docs. Tracks sent to
+    Google Maps are at %1$s, \"My Places\". Tracks sent to Google Fusion Tables are at %2$s. Tracks
+    sent to Google Docs are at %3$s.
+  </string>
+  <string name="help_send_track_question"
+    translation_description="In the 'Help' page, the question on sending a track.">
+    Where can I send a track?
+  </string>
   <string name="help_share_friends_answer"
     translation_description="In the 'Help' page, the answer on sharing with friends.">
-    You can share a track as a link to Google Map. Your track will first get uploaded to Google Map.
+    You can share a track as a link to Google Maps. Your track will first get uploaded to Google
+    Maps.
   </string>
   <string name="help_share_friends_question"
     translation_description="In the 'Help' page, the question on sharing with friends.">
-    How do I share tracks with friends and the rest of the world?
+    How do I share a track with friends?
   </string>
   <string name="help_share_visibility_answer"
     translation_description="In the 'Help' page, the answer on share visibility.">
diff --git a/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java b/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
index 6a484cd7b..38b701c0a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
@@ -40,8 +40,8 @@ public class HelpActivity extends AbstractMyTracksActivity {
     mapsPublicUnlisted.setText(getString(
         R.string.help_maps_public_unlisted_answer, getString(R.string.maps_public_unlisted_url)));
 
-    TextView googleServices = (TextView) findViewById(R.id.help_google_services_answer);
-    googleServices.setText(getString(R.string.help_google_services_answer,
+    TextView sendTrack = (TextView) findViewById(R.id.help_send_track_answer);
+    sendTrack.setText(getString(R.string.help_send_track_answer,
         getString(R.string.send_google_maps_url),
         getString(R.string.send_google_fusion_tables_url),
         getString(R.string.send_google_docs_url)));